Preparing release 1.5
Merge branch 'release/1.5' into develop
Back to development: 1.6