Merge pull request #262 from daenney/shrink-test-matrix