Merge v1.7.x onto master

Having seen this, it makes sense to wait until 1.7.1 has been released.