Merged revisions 52107 via svnmerge from