Bumped version and changelog
Merge branch 'master' into refactoring/minor