Merged revisions 159476 via svnmerge from