Merge branch 'release-0.1.6' main master v0.1.6
authorDavid ‘Bombe’ Roden <bombe@freenetproject.org>
Sat, 5 May 2018 22:17:53 +0000 (00:17 +0200)
committerDavid ‘Bombe’ Roden <bombe@freenetproject.org>
Sat, 5 May 2018 22:17:53 +0000 (00:17 +0200)

Trivial merge