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

Trivial merge