Merge part of kh/svnimport branch into master