SciTools/iris — pull request #1460 by bjlittle (2014-11-25 16:57:10+00:00)
Title: Merge v1.7.x

This PR merges the latest v1.7.x with upstream/master.