Merge branch 'release/0.5' into develop
0.6
Merge branch 'release/0.6'