Merged revisions 53062 via svnmerge from