Merge remote-tracking branch 'upstream/2021.12-rc' into api-direct-messages
authorMichael <heluecht@pirati.ca>
Sun, 19 Dec 2021 07:02:33 +0000 (07:02 +0000)
committerMichael <heluecht@pirati.ca>
Sun, 19 Dec 2021 07:02:33 +0000 (07:02 +0000)

Trivial merge