Merged revisions 139456 via svnmerge from