Merge branch 'master' into next
authorDavid ‘Bombe’ Roden <bombe@freenetproject.org>
Sun, 1 Oct 2017 15:19:35 +0000 (17:19 +0200)
committerDavid ‘Bombe’ Roden <bombe@freenetproject.org>
Sun, 1 Oct 2017 15:19:35 +0000 (17:19 +0200)

Trivial merge