Merge branch 'ls/travis-win-fix-status'