Merge branch 'release/0.7'
Merge tag '0.7' into develop

0.7