Merged revisions 53075 via svnmerge from