Merged revisions 338801 via svnmerge from