Merge branch 'develop' into bug/JAL-2461 bug/JAL-2461
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 3 Apr 2017 11:56:53 +0000 (12:56 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 3 Apr 2017 11:56:53 +0000 (12:56 +0100)

Trivial merge