Merge branch 'master' into develop
Updating semver and CHANGELOG.md
Merge branch 'develop' into release/2.5.1
Merge branch 'release/2.5.1'