Recorded merge of revisions 259441 via svnmerge from