Switch to 2.1
Switch 2.1 to 2.1.1
Merge pull request #2290 from penibelst/travis-workaround