updated travis test matrix
Merge branch 'master' into next