Merge remote-tracking branch 'origin/develop' into feature/JAL-2664
authorkiramt <k.mourao@dundee.ac.uk>
Fri, 18 Aug 2017 10:53:23 +0000 (11:53 +0100)
committerkiramt <k.mourao@dundee.ac.uk>
Fri, 18 Aug 2017 10:53:23 +0000 (11:53 +0100)

Trivial merge