0.7.0
Merge branch 'master' into dev