Merge remote-tracking branch 'origin/master' into v2.x
authorMathieu Baudier <mbaudier@argeo.org>
Fri, 5 Feb 2021 20:06:12 +0000 (21:06 +0100)
committerMathieu Baudier <mbaudier@argeo.org>
Fri, 5 Feb 2021 20:06:12 +0000 (21:06 +0100)

Trivial merge