Merge remote-tracking branch 'origin/develop' into bug/JAL-2665
authorkiramt <k.mourao@dundee.ac.uk>
Fri, 18 Aug 2017 08:19:58 +0000 (09:19 +0100)
committerkiramt <k.mourao@dundee.ac.uk>
Fri, 18 Aug 2017 08:19:58 +0000 (09:19 +0100)

Trivial merge