Merged revisions 142358 via svnmerge from