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