Merge branch 'js/travis-32bit-linux'