Recorded merge of revisions 252366 via svnmerge from