Set correct version number
Changelog and version number
Merge branch 'master' into release