SciTools/iris — pull request #985 by bblay (2014-01-27 11:30:26+00:00)
Title: V1.6.0 to master

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