Merged revisions 50674 via svnmerge from