Merge remote-tracking branch 'origin/patch/JAL-2732' into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 18 Sep 2017 09:44:25 +0000 (10:44 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 18 Sep 2017 09:44:25 +0000 (10:44 +0100)

Trivial merge