Merge branch 'bug/JAL-2586' into develop
authorkiramt <k.mourao@dundee.ac.uk>
Thu, 8 Jun 2017 14:01:35 +0000 (15:01 +0100)
committerkiramt <k.mourao@dundee.ac.uk>
Thu, 8 Jun 2017 14:01:35 +0000 (15:01 +0100)

Trivial merge