From: Niki Roo <niki@nikiroo.be>
Date: Tue, 5 May 2020 18:42:37 +0000 (+0200)
Subject: Merge master
X-Git-Url: http://git.nikiroo.be/?a=commitdiff_plain;h=9a553563269f93bae59cf45e43933c81fdec07e8;hp=9a553563269f93bae59cf45e43933c81fdec07e8;p=fanfix.git

Merge master
---