! Time for an option to grow up and become default. Fixes #1260

Signed-off-by: Peter Spicer <sleeping@myperch.org>
! Might help if I committed these but note that they aren't finished yet.

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

Stuff