Merge branch 'upstream'
Use travis-build