Merge branch 'release/1.1.0' into develop
Fix file paths.
Update version.
Merge branch 'release/1.1.1'