Update CHANGELOG.md
Update .semver
Merge branch 'develop'
Merge branch 'master' into develop