修复travis
Merge branch 'master' into develop