Recorded merge of revisions 339681 via svnmerge from