SciTools/iris — pull request #1462 by cpelley (2014-11-26 11:03:55+00:00)
Title: Merged 17x

This PR simply merges 17x into master.