Merged revisions 141741 via svnmerge from