Merged revisions 139869 via svnmerge from