[Fix] Change travis settings
Merge branch 'master' into develop