Merge remote-tracking branch 'origin/master' into v2.x
authorMathieu Baudier <mbaudier@argeo.org>
Sun, 4 Apr 2021 07:56:31 +0000 (09:56 +0200)
committerMathieu Baudier <mbaudier@argeo.org>
Sun, 4 Apr 2021 07:56:31 +0000 (09:56 +0200)

Trivial merge