Merged revisions 140670 via svnmerge from