Merged revisions 338085 via svnmerge from