Merged revisions 53052 via svnmerge from