fix travis config
Merge origin/master