Merge remote-tracking branch 'origin/imp/JAL-2775' into bug/JAL-2778again
authorkiramt <k.mourao@dundee.ac.uk>
Wed, 1 Nov 2017 12:09:23 +0000 (12:09 +0000)
committerkiramt <k.mourao@dundee.ac.uk>
Wed, 1 Nov 2017 12:09:23 +0000 (12:09 +0000)

Trivial merge