Merge branch 'master' of github.com:nikiroo/fanfix
authorNiki Roo <niki@nikiroo.be>
Thu, 13 Sep 2018 19:26:29 +0000 (21:26 +0200)
committerNiki Roo <niki@nikiroo.be>
Thu, 13 Sep 2018 19:26:29 +0000 (21:26 +0200)

Trivial merge