Merged revisions 139909 via svnmerge from