JAL-2429 Messed something up, merged conflicts
authorkiramt <k.mourao@dundee.ac.uk>
Tue, 7 Mar 2017 10:00:37 +0000 (10:00 +0000)
committerkiramt <k.mourao@dundee.ac.uk>
Tue, 7 Mar 2017 10:00:37 +0000 (10:00 +0000)

Trivial merge