Merged revisions 140690 via svnmerge from