Merge branch 'develop' into bug/JAL-2314
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 3 Apr 2017 13:13:46 +0000 (14:13 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 3 Apr 2017 13:13:46 +0000 (14:13 +0100)

Trivial merge