Merge remote-tracking branch 'origin/v2.x'
authorMathieu Baudier <mbaudier@argeo.org>
Wed, 14 Apr 2021 10:03:41 +0000 (12:03 +0200)
committerMathieu Baudier <mbaudier@argeo.org>
Wed, 14 Apr 2021 10:03:41 +0000 (12:03 +0200)

Trivial merge