Merge branch 'develop-upgrade-to-v2.1.0' into 'master'

Bumped version to v2.1.0. Fixed test.

See merge request !14
1 job for master
in 0 seconds, using 0 compute credits, and was queued for 0 seconds