Merged revisions 142675 via svnmerge from