Test for 2.1 compatibility since it's "due soon."
Merge pull request #534 from envygeeks/patch-1

Test for 2.1 compatibility since it's "due soon."