Merge tag 'v2.1.1'

Release of version 2.1.1.
7 jobs for master in 5 minutes and 51 seconds (queued for 1 second)