Merged revisions 142218 via svnmerge from