Merge branch 'ls/travis-stricter-linux32-builds'