Merge remote-tracking branch 'origin/bug/JAL-2256' into develop
authorkiramt <k.mourao@dundee.ac.uk>
Mon, 22 May 2017 10:57:47 +0000 (11:57 +0100)
committerkiramt <k.mourao@dundee.ac.uk>
Mon, 22 May 2017 10:57:47 +0000 (11:57 +0100)

Trivial merge