Merge branch 'release/0.9a6'
Merge tag '0.9a6' into develop

Sprint 6