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

Merge from master
---