Merged revisions 159976 via svnmerge from