! For some reason, some of the fixes that were in 2.0.5 weren't pushed to 2.1 as well. Better to be safe than sorry.

Signed-off-by: Peter Spicer <sleeping@myperch.org>
Merge pull request #674 from Arantor/release-2.1

! For some reason, some of the fixes that were in 2.0.5 weren't pushed t...