Merge remote-tracking branch 'origin/develop' into bug/JAL-2314
authorkiramt <k.mourao@dundee.ac.uk>
Fri, 24 Mar 2017 09:44:01 +0000 (09:44 +0000)
committerkiramt <k.mourao@dundee.ac.uk>
Fri, 24 Mar 2017 09:44:01 +0000 (09:44 +0000)

Trivial merge