Merge branch '2.3.x'

See gh-23496
This commit is contained in:
Stephane Nicoll 2020-09-28 14:40:39 +02:00
commit 5553926267