Merge remote-tracking branch 'origin/bug/JAL-2740' into feature/JAL-2674take2
authorkiramt <k.mourao@dundee.ac.uk>
Tue, 26 Sep 2017 10:58:05 +0000 (11:58 +0100)
committerkiramt <k.mourao@dundee.ac.uk>
Tue, 26 Sep 2017 10:58:05 +0000 (11:58 +0100)

Trivial merge