Merge branch 'development'
Version bump
Merge branch 'master' into development