Merge branch 'kh/svn' into next