Merge branch '2.7' into 2.8

* 2.7:
  fixed tests
  fixed some tests
  Remove excess whitespace
This commit is contained in:
Fabien Potencier 2015-07-13 11:10:01 +02:00
commit b7d003e9ab