version bump for next release
Merge branch 'master' into sm