Merge remote-tracking branch 'upstream/develop' into contact-discovery
authorMichael <heluecht@pirati.ca>
Mon, 24 Jun 2019 05:41:10 +0000 (05:41 +0000)
committerMichael <heluecht@pirati.ca>
Mon, 24 Jun 2019 05:41:10 +0000 (05:41 +0000)

Trivial merge