Merged revisions 53035 via svnmerge from