Test on 2.1 as well
Merge remote-tracking branch 'origin/update-travis-matrix'