Merged revisions 49237 via svnmerge from