Merged revisions 142354 via svnmerge from