Merge branch 'mk/svn'