Merge branch '1.x' into 2.x

* 1.x:
  simplified code
This commit is contained in:
Fabien Potencier
2016-12-05 10:21:22 +01:00

Diff Content Not Available