SciTools/iris — pull request #1238 by esc24 (2014-07-17 16:11:50+00:00)
Title: Merging v1.7.x on to master

This PR merges the latest 1.7.x bugfixes onto master.