Merge remote-tracking branch 'upstream/2020.09-rc' into api-count
authorMichael <heluecht@pirati.ca>
Mon, 7 Sep 2020 14:29:02 +0000 (14:29 +0000)
committerMichael <heluecht@pirati.ca>
Mon, 7 Sep 2020 14:29:02 +0000 (14:29 +0000)

Trivial merge