Merge remote-tracking branch 'riseup/master'
authorkwadronaut <kwadronaut@leap.se>
Wed, 7 Nov 2018 14:43:05 +0000 (15:43 +0100)
committerkwadronaut <kwadronaut@leap.se>
Wed, 7 Nov 2018 14:43:05 +0000 (15:43 +0100)

Trivial merge