Merge branch 'upstream-svn' into upstream