Merged revisions 335346 via svnmerge from