Merge branch 'ls/travis-scriptify'