Release 2.1

David Schäferrequested to merge
develop into master

See the CHANGELOG for a list of changes.

Merge request reports