Merge remote-tracking branch 'origin/master' into v2.x
authorMathieu Baudier <mbaudier@argeo.org>
Sun, 7 Feb 2021 12:12:31 +0000 (13:12 +0100)
committerMathieu Baudier <mbaudier@argeo.org>
Sun, 7 Feb 2021 12:12:31 +0000 (13:12 +0100)

Trivial merge