Merge branch 'master' into next
authorDavid ‘Bombe’ Roden <bombe@freenetproject.org>
Fri, 10 Jun 2016 16:54:15 +0000 (18:54 +0200)
committerDavid ‘Bombe’ Roden <bombe@freenetproject.org>
Fri, 10 Jun 2016 16:54:15 +0000 (18:54 +0200)

Trivial merge