1.7 on dev as a release candidate

[chrisgoringe]

I've moved all the outstanding things from 1.7 into 1.8, so the dev branch is now a release candidate at 1.7

Any bugs on dev can be raised as issues.