Merge branch 'master' of github.com:nikiroo/fanfix
authorNiki Roo <niki@nikiroo.be>
Thu, 21 Dec 2017 06:44:56 +0000 (07:44 +0100)
committerNiki Roo <niki@nikiroo.be>
Thu, 21 Dec 2017 06:44:56 +0000 (07:44 +0100)

Trivial merge