Merge remote-tracking branch 'meteorite/next' into next
authorDavid ‘Bombe’ Roden <bombe@freenetproject.org>
Wed, 4 Oct 2017 20:09:00 +0000 (22:09 +0200)
committerDavid ‘Bombe’ Roden <bombe@freenetproject.org>
Wed, 4 Oct 2017 20:09:00 +0000 (22:09 +0200)

Trivial merge