Merge branch 'develop' into bug/JAL-2837
authorkiramt <k.mourao@dundee.ac.uk>
Fri, 17 Nov 2017 12:09:20 +0000 (12:09 +0000)
committerkiramt <k.mourao@dundee.ac.uk>
Fri, 17 Nov 2017 12:09:20 +0000 (12:09 +0000)

Trivial merge