Merge branch 'release/1.1.4' into develop
Prep for release
Merge branch 'release/1.1.5'