Merge remote-tracking branch 'origin/task/JAL-2662' into develop
authorkiramt <k.mourao@dundee.ac.uk>
Tue, 19 Sep 2017 14:03:14 +0000 (15:03 +0100)
committerkiramt <k.mourao@dundee.ac.uk>
Tue, 19 Sep 2017 14:03:14 +0000 (15:03 +0100)

Trivial merge