Merge remote-tracking branch 'upstream/develop' into nodeinfo2
authorMichael <heluecht@pirati.ca>
Sun, 12 Jul 2020 22:06:56 +0000 (22:06 +0000)
committerMichael <heluecht@pirati.ca>
Sun, 12 Jul 2020 22:06:56 +0000 (22:06 +0000)

Trivial merge