Merge branch '2.2.x'

Closes gh-19178
This commit is contained in:
Stephane Nicoll 2019-11-28 10:59:19 +01:00
commit 4efd6a4021
1 changed files with 3 additions and 3 deletions