Merge remote-tracking branch 'origin/bug/JAL-2515' into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 8 May 2017 12:17:04 +0000 (13:17 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 8 May 2017 12:17:04 +0000 (13:17 +0100)

Trivial merge