Build matrix for travis-ci
Merge remote-tracking branch 'upstream/next' into next
Merge pull request #75 from alexander-zimmermann/next

Build matrix for travis-ci