Revision 59fa66e9a6f07b4f61aa9ec3e6614f727244dac6

Committed on 06/06/2018 11:21 pm by Fabien Potencier <fabien@potencier.org> [GitHub Diff]

Merge branch '4.0'

* 4.0:
fixed CS