update travis-build

fix fix fix
Merge branch 'master' into staging