Merge remote-tracking branch 'upstream/2020.12-rc' into notices
authorMichael <heluecht@pirati.ca>
Wed, 30 Dec 2020 07:12:59 +0000 (07:12 +0000)
committerMichael <heluecht@pirati.ca>
Wed, 30 Dec 2020 07:12:59 +0000 (07:12 +0000)

Trivial merge