Recorded merge of revisions 142807 via svnmerge from