Merge branch 'develop' into improvement/JAL-3322_getdown_splashscreen_visibility
authorBen Soares <bsoares@dundee.ac.uk>
Wed, 26 Jun 2019 15:33:37 +0000 (16:33 +0100)
committerBen Soares <bsoares@dundee.ac.uk>
Wed, 26 Jun 2019 15:33:37 +0000 (16:33 +0100)
merging with develop


Trivial merge