Merge pull request #584 from mayeut/travis-matrix