Bumping version
Merge branch 'master' into b/cleanup