Merged revisions 52688 via svnmerge from