Recorded merge of revisions 250613 via svnmerge from