Merge branch 'bug/JAL-2597' into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 30 Jun 2017 12:00:56 +0000 (13:00 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 30 Jun 2017 12:00:56 +0000 (13:00 +0100)

Trivial merge