! Cleanliness and consistency is good.

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

! Cleanliness and consistency is good.