Added git clone depth of zero to travis CI config.
Merge pull request #541 from esc24/v1.4fixed

Added git clone depth of zero to travis CI config.
MAIN: Removed all whitespace and file-end lines
Merge pull request #538 from cpelley/whitespace_rm_v2

STY: Removed all whitespace and file-end lines
1.4 changelog and what's new
Merge pull request #540 from bblay/suuup

1.4.0 changes and what's new
Bumped version to 1.4.0rc1
Restore version back to 1.4.0-dev
Merge pull request #544 from esc24/1.4.0rc1

1.4.0rc1 version number
v1.4.0
v1.4.1-dev
Merge pull request #556 from bblay/v1.4.x

Release v1.4.0
Doc tweaks for custom season categorisation
Merge pull request #558 from rhattersley/custom-season-doc-tweaks

Doc tweaks for custom season categorisation
BUG: Updated copyright dates on docs
Update PPA to get a working libgeos-dev
Merge pull request #640 from cpelley/copyright_fix

BUG: Updated copyright dates on docs
Merge remote branch 'upstream/v1.4.x' into v1.4.x_merge

* upstream/v1.4.x:
  Update PPA to get a working libgeos-dev
  BUG: Updated copyright dates on docs
  Doc tweaks for custom season categorisation
  v1.4.1-dev
  v1.4.0
  Restore version back to 1.4.0-dev
  Bumped version to 1.4.0rc1
  1.4 changelog and what's new
  MAIN: Removed all whitespace and file-end lines
  Added git clone depth of zero to travis CI config.

Conflicts:
	docs/iris/example_code/graphics/COP_1d_plot.py
	docs/iris/example_code/graphics/SOI_filtering.py
	docs/iris/example_code/graphics/custom_file_loading.py
	docs/iris/example_code/graphics/lagged_ensemble.py
	lib/iris/__init__.py
	lib/iris/_cube_coord_common.py
	lib/iris/_merge.py
	lib/iris/analysis/calculus.py
	lib/iris/analysis/cartography.py
	lib/iris/analysis/interpolate.py
	lib/iris/aux_factory.py
	lib/iris/coord_categorisation.py
	lib/iris/coord_systems.py
	lib/iris/fileformats/__init__.py
	lib/iris/fileformats/cf.py
	lib/iris/fileformats/ff.py
	lib/iris/fileformats/grib/__init__.py
	lib/iris/fileformats/grib/grib_save_rules.py
	lib/iris/fileformats/manager.py
	lib/iris/fileformats/pp.py
	lib/iris/fileformats/rules.py
	lib/iris/io/format_picker.py
	lib/iris/palette.py
	lib/iris/quickplot.py
	lib/iris/tests/__init__.py
	lib/iris/tests/stock.py
	lib/iris/tests/test_basic_maths.py
	lib/iris/tests/test_cdm.py
	lib/iris/tests/test_cf.py
	lib/iris/tests/test_coding_standards.py
	lib/iris/tests/test_coord_api.py
	lib/iris/tests/test_cube_to_pp.py
	lib/iris/tests/test_interpolation.py
	lib/iris/tests/test_pp_module.py
	setup.py
Merge pull request #727 from pelson/v1.4.x_merge

Merged v1.4.x back into master.