Merge branch 'master' into next
authorDavid ‘Bombe’ Roden <bombe@freenetproject.org>
Sat, 5 May 2018 22:19:32 +0000 (00:19 +0200)
committerDavid ‘Bombe’ Roden <bombe@freenetproject.org>
Sat, 5 May 2018 22:19:32 +0000 (00:19 +0200)

Trivial merge