Merged revisions 138028 via svnmerge from