Merged revisions 57318 via svnmerge from