Merged revisions 49465 via svnmerge from