Merge branch 'master' of https://github.com/stratiot/test
Merge branch 'master' of https://github.com/stratiot/test