Merge remote-tracking branch 'upstream/develop' into daemon
authorMichael <heluecht@pirati.ca>
Sat, 2 Jun 2018 04:03:55 +0000 (04:03 +0000)
committerMichael <heluecht@pirati.ca>
Sat, 2 Jun 2018 04:03:55 +0000 (04:03 +0000)

Trivial merge