Merged revisions 52807 via svnmerge from