Merged revisions 38825 via svnmerge from