Merged revisions 49212 via svnmerge from