Merge branch 'develop' into task/JAL-2662
authorkiramt <k.mourao@dundee.ac.uk>
Fri, 18 Aug 2017 10:03:22 +0000 (11:03 +0100)
committerkiramt <k.mourao@dundee.ac.uk>
Fri, 18 Aug 2017 10:03:22 +0000 (11:03 +0100)

Trivial merge