Merged revisions 53114 via svnmerge from