Merge release 0.7.0 back into master