Merge branch 'sg/travis-linux32-sanity'