! Core Features, you were a worthy piece of code in your own right, and you gained some very nice functionality, but no amount of wonderful implementation could have made you a _good_ feature. Fare thee well.

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

! Core Features, you were a worthy piece of code in your own right, and ...