WIP: Travis CI update

Created originally on Bitbucket by avmo (Ashwin Vishnu)

Was already merged in Bitbucket before import, marked as merged by the import user

Do not merge yet