Merged revisions 52462 via svnmerge from