Merged revisions 139621 via svnmerge from