Merged revisions 38972 via svnmerge from