Merge svn with master
Merge dev-branch with master