Merge branch 'ls/travis-yaml'