Update version
Version bump
Merge branch 'release/release-1.1.4' into develop