Merge branch 'develop-upgrade-to-2.1.1' into 'master'

Bumped version to v2.1.1.

See merge request !17
14 jobs for master
in 44 seconds, using 0 compute credits, and was queued for 10 seconds