Merge branch 'v2.1-dev' into 'v2.x-master'

V2.1 dev

See merge request !6
3 jobs for v2.x-master in 2 minutes and 37 seconds (queued for 1 second)