Merged revisions 142079 via svnmerge from