Merged revisions 139387 via svnmerge from