Merge branch 'develop' into bug/JAL-2491
authorkiramt <k.mourao@dundee.ac.uk>
Tue, 16 May 2017 09:15:40 +0000 (10:15 +0100)
committerkiramt <k.mourao@dundee.ac.uk>
Tue, 16 May 2017 09:15:40 +0000 (10:15 +0100)

Trivial merge