change travis branch
Merge branch 'master' into develop