Merge branch 'devel'
Set correct version number
Merge branch 'master' into devel