SciTools/iris — pull request #559 by bblay (2013-06-17 12:40:02+00:00)
Title: Merge 1.4.x changes into master branch

Plus, conflicts resolved and tests fixed in the final two commits.