Merged revisions 49063 via svnmerge from