Merge branch 'release/1.1.4' into develop
Bumped version number
Merge branch 'release/1.1.5'