Merge branch 'dm/svn-branch'