Merge branch 'master' into terencehill/glowmod_color_fix
authorterencehill <piuntn@gmail.com>
Mon, 8 Jun 2020 18:30:41 +0000 (20:30 +0200)
committerterencehill <piuntn@gmail.com>
Mon, 8 Jun 2020 18:30:41 +0000 (20:30 +0200)

Trivial merge