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

Trivial merge