Merge remote-tracking branch 'upstream/v1.7.x' into merged_17x

Conflicts:
	.travis.yml
	lib/iris/fileformats/ff.py