Merged revisions 53042 via svnmerge from