Merge branch 'kh/svnimport' into next