From: Niki Roo <niki@nikiroo.be>
Date: Thu, 14 May 2020 14:16:39 +0000 (+0200)
Subject: merge from master
X-Git-Url: http://git.nikiroo.be/?a=commitdiff_plain;h=b627826356289872dd817b9e5903e209fa881886;hp=b627826356289872dd817b9e5903e209fa881886;p=fanfix.git

merge from master
---