Merge branch 'master' of github.com:NERC-CEH/jules-jasmin

Conflicts:
	majic/joj/controllers/model_run.py
	majic/joj/tests/functional/test_model_run_extents.py