Merge branch 'hotfix/1.1.4' into develop
Bug fixes. Inconsistent version numbers.
Merge branch 'release/1.1.5'