Merged revisions 338719 via svnmerge from