Merge branch '4.0'

* 4.0:
  cs fix
This commit is contained in:
Nicolas Grekas 2018-01-22 13:03:11 +01:00
commit 8cf8d1619f