Merge svn with master
Maybe fix the dev-branch
Merge dev-branch with master
Maybe fix master.