synced with matthieu
Merge pull request #1 from gwenzek/matthieu2

Matthieu2