Merge branch 'devel'
Bump version
Merge branch 'master' into devel
Start new dev version