Merge branch '2.8' into 3.2

* 2.8:
  Fix indent of methods
This commit is contained in:
Fabien Potencier 2017-07-05 09:50:55 +03:00
commit f3cba17b29