version bump
Merge branch 'master' into develop