Merged revisions 140053 via svnmerge from