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

merge from master
---