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