Merge branch 'master' into develop
Merge branch 'master' into develop
version bump
typos
Merge branch 'develop'