Preparing new release: 0.6.0
Merge branch 'releases/0.6'
Merge branch 'master' into develop