Merge branch 'merge/JAL-3310_and_JAL-3300' into develop
authorBen Soares <bsoares@dundee.ac.uk>
Wed, 19 Jun 2019 11:51:21 +0000 (12:51 +0100)
committerBen Soares <bsoares@dundee.ac.uk>
Wed, 19 Jun 2019 11:51:21 +0000 (12:51 +0100)

Trivial merge