Update travis-build
Merge branch 'master' into bluebox-production-org