Merged revisions 53081 via svnmerge from