Merge branch 'develop' into improvement/JAL-3438_eclipse_java_code_formatting_as_a_gr...
authorBen Soares <bsoares@dundee.ac.uk>
Tue, 14 Jan 2020 19:10:07 +0000 (19:10 +0000)
committerBen Soares <bsoares@dundee.ac.uk>
Tue, 14 Jan 2020 19:10:07 +0000 (19:10 +0000)

Trivial merge