Preparing release 0.5
Merge branch 'release/0.5' into develop
Back to development: 0.6