Merge remote-tracking branch 'upstream/2019.09-rc' into delivery-counter
authorMichael <heluecht@pirati.ca>
Thu, 5 Sep 2019 03:10:34 +0000 (03:10 +0000)
committerMichael <heluecht@pirati.ca>
Thu, 5 Sep 2019 03:10:34 +0000 (03:10 +0000)

Trivial merge