Merge branch '0.7.0'
Merge branch '0.7.1'
Merge branch 'master' into develop