Merged revisions 49061 via svnmerge from