Merge pull request #2478 from Oldiesmann/release-2.1

! Minor upgrade tweaks