Bump version
Merge branch 'release/v1.1.4' into develop