Merge remote-tracking branch 'origin/develop' into feature/2588
authorkiramt <k.mourao@dundee.ac.uk>
Wed, 28 Jun 2017 09:59:17 +0000 (10:59 +0100)
committerkiramt <k.mourao@dundee.ac.uk>
Wed, 28 Jun 2017 09:59:17 +0000 (10:59 +0100)

Trivial merge