Merge branch 'master' of https://github.com/nikiroo/fanfix
authorNiki <niki@nikiroo.be>
Mon, 14 Oct 2019 06:46:56 +0000 (08:46 +0200)
committerNiki <niki@nikiroo.be>
Mon, 14 Oct 2019 06:46:56 +0000 (08:46 +0200)

Trivial merge