Merge pull request #1253 from Arantor/release-2.1

Merging various goodies