changelog update
Merge branch 'pre_release_0.6.0' into develop