Merge pull request #1164 from Arantor/release-2.1

More things we don't really need any more
Merge pull request #1165 from Arantor/release-2.1

! Quick reply might be permanently on, but there's no need to show it if...
Merge pull request #1173 from Arantor/release-2.1

Odds and ends
Merge pull request #1174 from Arantor/release-2.1

More odds and ends