SciTools/iris — pull request #1440 by bjlittle (2014-11-17 17:10:37+00:00)
Title: Merge v1.7.x

This PR merges v1.7.x to upstream/master.