Merge branch 'release-0.6.0'
Merge remote-tracking branch 'upstream/master' into develop