[MERGE] Forward-port of 11.0 to 12.0

This commit is contained in:
Antoine Vandevenne (anv) 2020-01-16 09:56:18 +01:00
commit 5e9fd47f7a

Diff Content Not Available