Merge branch 'develop'
Version bump
Merge branch 'master' into develop