Merged revisions 52370 via svnmerge from