Fix .travix.yml
Merge branch 'master' into cli-test