Merge remote-tracking branch 'upstream/2021.12-rc' into announce-notification
authorMichael <heluecht@pirati.ca>
Sun, 23 Jan 2022 19:38:16 +0000 (19:38 +0000)
committerMichael <heluecht@pirati.ca>
Sun, 23 Jan 2022 19:38:16 +0000 (19:38 +0000)

Trivial merge