Merged revisions 39081 via svnmerge from