Merge remote-tracking branch 'upstream/develop' into delivery-statistics
authorMichael <heluecht@pirati.ca>
Fri, 28 Jun 2019 14:08:54 +0000 (14:08 +0000)
committerMichael <heluecht@pirati.ca>
Fri, 28 Jun 2019 14:08:54 +0000 (14:08 +0000)

Trivial merge