1.7.0
Merge branch 'master' into milestones/2.0.0