Merge svn with dev-branch