From: Niki Roo <niki@nikiroo.be>
Date: Mon, 11 May 2020 23:04:01 +0000 (+0200)
Subject: merge from master
X-Git-Url: http://git.nikiroo.be/?a=commitdiff_plain;h=4b3d19dce4816fee47886ae525664fef74e0380e;hp=4b3d19dce4816fee47886ae525664fef74e0380e;p=fanfix.git

merge from master
---