Merged revisions 53464 via svnmerge from