Merging 1.7.1

Merging work done on the 1.7 branch into develop. This includes the following PRs: #186 #189 #190 #192 #197 #198

It would be good to have someone eyeball things before it's merged.