build 0.6.0-7
Merge branch 'release/0.6.0-7' into develop