Merge remote-tracking branch 'origin/master' into v2.x
authorMathieu Baudier <mbaudier@argeo.org>
Sat, 4 Sep 2021 04:25:51 +0000 (06:25 +0200)
committerMathieu Baudier <mbaudier@argeo.org>
Sat, 4 Sep 2021 04:25:51 +0000 (06:25 +0200)

Trivial merge