Merge pull request #1019 from Arantor/release-2.1

Various minor stuff.