Merged revisions 338228 via svnmerge from