Merged revisions 50820 via svnmerge from