Merge pull request #2491 from Oldiesmann/release-2.1

! Descriptions are nice to have (fixes #2486)