Merge branch 'develop' into JAL-3322_getdown_speed_improvement
authorBen Soares <bsoares@dundee.ac.uk>
Fri, 28 Jun 2019 09:33:48 +0000 (10:33 +0100)
committerBen Soares <bsoares@dundee.ac.uk>
Fri, 28 Jun 2019 09:33:48 +0000 (10:33 +0100)
merging in develop


Trivial merge