Merged revisions 138886 via svnmerge from