Merge branch 'imp/JAL-2774' into bug/JAL-2831
authorkiramt <k.mourao@dundee.ac.uk>
Tue, 14 Nov 2017 09:30:31 +0000 (09:30 +0000)
committerkiramt <k.mourao@dundee.ac.uk>
Tue, 14 Nov 2017 09:30:31 +0000 (09:30 +0000)

Trivial merge