0.5
Merge branch 'release/0.5' into develop
develop is 0.6dev now