Matrixing for travis-ci/travis-build#309