Merged revisions 337263 via svnmerge from