Merge branch 'kh/svn'