V1.6.0 to master

Replacing https://github.com/SciTools/iris/pull/983, this doesn't have an extra merge at the end.