Merge remote-tracking branch 'origin/bug/JAL-2282' into develop
authorkiramt <k.mourao@dundee.ac.uk>
Wed, 2 Nov 2016 18:03:42 +0000 (18:03 +0000)
committerkiramt <k.mourao@dundee.ac.uk>
Wed, 2 Nov 2016 18:03:42 +0000 (18:03 +0000)

Trivial merge