Merge master into v2.x, without modifying Maven pom files.
authorMathieu Baudier <mbaudier@argeo.org>
Fri, 5 Feb 2021 19:36:48 +0000 (20:36 +0100)
committerMathieu Baudier <mbaudier@argeo.org>
Fri, 5 Feb 2021 19:36:48 +0000 (20:36 +0100)

Trivial merge