Merged revisions 338997 via svnmerge from