Merge branch 'develop' into task/JAL-3337_gradle_tasks_sourceDist_and_help2Website
authorBen Soares <bsoares@dundee.ac.uk>
Mon, 1 Jul 2019 09:17:31 +0000 (10:17 +0100)
committerBen Soares <bsoares@dundee.ac.uk>
Mon, 1 Jul 2019 09:17:31 +0000 (10:17 +0100)
update merging develop into this branch


Trivial merge