Merge branch 'ls/travis-homebrew-path-fix' into maint