Preparing for release 0.7.0
Merge branch '0.7.x'