From f54267609825d0dd54e1176ea51c59d9e0b3bb87 Mon Sep 17 00:00:00 2001
From: jfh <dev@optimistik.fr>
Date: Sun, 23 Aug 2020 00:13:47 +0200
Subject: [PATCH] Merge branch 'master' into new-build