Merged revisions 50228 via svnmerge from