Merged revisions 338323 via svnmerge from