Merged revisions 52808 via svnmerge from