Merge remote-tracking branch 'origin/bug/JAL-2739' into feature/JAL-2674take2
authorkiramt <k.mourao@dundee.ac.uk>
Fri, 22 Sep 2017 13:16:31 +0000 (14:16 +0100)
committerkiramt <k.mourao@dundee.ac.uk>
Fri, 22 Sep 2017 13:16:31 +0000 (14:16 +0100)

Trivial merge