[travis] Synchronize
Merge pull request #48 from bchretien/master

[travis] Synchronize