Merge remote-tracking branch 'origin/bug/JAL-2576' into bug/JAL-2591
authorkiramt <k.mourao@dundee.ac.uk>
Tue, 6 Jun 2017 06:35:27 +0000 (07:35 +0100)
committerkiramt <k.mourao@dundee.ac.uk>
Tue, 6 Jun 2017 06:35:27 +0000 (07:35 +0100)

Trivial merge