Merged revisions 52052 via svnmerge from