modify travis yml
Merge branch 'master' into develop