Merge pull request #713 from Arantor/release-2.1

A few miscellaneous bits and pieces, nothing exciting