JAL-2282 Merge
authorkiramt <k.mourao@dundee.ac.uk>
Tue, 1 Nov 2016 12:13:27 +0000 (12:13 +0000)
committerkiramt <k.mourao@dundee.ac.uk>
Tue, 1 Nov 2016 12:13:27 +0000 (12:13 +0000)

Trivial merge