Merge remote-tracking branch 'origin/bug/JAL-2282' into develop
authorkiramt <k.mourao@dundee.ac.uk>
Fri, 4 Nov 2016 14:29:55 +0000 (14:29 +0000)
committerkiramt <k.mourao@dundee.ac.uk>
Fri, 4 Nov 2016 14:29:55 +0000 (14:29 +0000)

Trivial merge