Merged revisions 139213 via svnmerge from