Merge branch 'ff/svnimport' into next