Merge branch 'develop'
Version bump + dch, declared for stable
Merge branch 'master' into develop