Merge branch 'pull/3164'
authorAndy Allan <git@gravitystorm.co.uk>
Wed, 14 Apr 2021 15:13:29 +0000 (16:13 +0100)
committerAndy Allan <git@gravitystorm.co.uk>
Wed, 14 Apr 2021 15:13:29 +0000 (16:13 +0100)

Trivial merge