Merge branch 'v1.6.x' into merge_in_1.6.x

Conflicts:
	lib/iris/__init__.py
	lib/iris/tests/unit/cube/test_CubeList.py
	setup.py