Merge branch 'develop' into improvement/JAL-3322_getdown_splashscreen_visibility
authorBen Soares <bsoares@dundee.ac.uk>
Fri, 21 Jun 2019 07:53:01 +0000 (08:53 +0100)
committerBen Soares <bsoares@dundee.ac.uk>
Fri, 21 Jun 2019 07:53:01 +0000 (08:53 +0100)
merging in develop


Trivial merge