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

v2.0-dev

See merge request !2
1 job for v2.1-dev in 1 minute and 49 seconds (queued for 1 second)