Merge branch 'travis-ci' into 'master'

Update Travis CI config

See merge request !149
7 jobs for master
in 2 minutes and 32 seconds and was queued for 1 second