Merge remote-tracking branch 'salsa/master' into master
authorReinhard Tartler <siretart@tauware.de>
Sat, 14 Nov 2020 02:26:31 +0000 (21:26 -0500)
committerReinhard Tartler <siretart@tauware.de>
Sat, 14 Nov 2020 02:26:31 +0000 (21:26 -0500)

Trivial merge