Merge branch 'develop' into bug/JAL-2934proportionalScrolling bug/JAL-2934proportionalScrolling
authorJames Procter <j.procter@dundee.ac.uk>
Thu, 14 Dec 2023 14:14:15 +0000 (14:14 +0000)
committerJames Procter <j.procter@dundee.ac.uk>
Thu, 14 Dec 2023 14:14:15 +0000 (14:14 +0000)

Trivial merge