Merge branch 'master' into terencehill/erebus_tweaks 729/head
authorterencehill <piuntn@gmail.com>
Sat, 2 May 2020 20:45:23 +0000 (22:45 +0200)
committerterencehill <piuntn@gmail.com>
Sat, 2 May 2020 20:45:23 +0000 (22:45 +0200)

Trivial merge