Merged revisions 140566 via svnmerge from