Merged revisions 341599 via svnmerge from