REL: 2.1.1
Merge pull request #564 from wasade/bump_to_2.1.1

REL: 2.1.1