Merge pull request #742 from Arantor/release-2.1

! Various things that needed updating.