Merge branch '1.x' into 2.x

* 1.x:
  Remove deprecated option
This commit is contained in:
Fabien Potencier
2020-05-19 16:00:56 +02:00

Diff Content Not Available