SciTools/iris — pull request #1021 by rhattersley (2014-02-11 11:09:51+00:00)
Title: Fixes from v1.6.x

This brings the changes from #1014 onto master.

Note the comment from the final merge commit:
```
Conflicts:
lib/iris/tests/integration/test_pp.py
lib/iris/tests/unit/fileformats/pp_rules/test_convert.py
```