Merged revisions 53093 via svnmerge from