Merged revisions 138023 via svnmerge from