Merge remote-tracking branch 'origin/develop'
Update .travix.yml.
Merge remote-tracking branch 'origin/master' into develop