Merge branch '3.6.1-dev' into 'master'

3.6.1 dev

See merge request !19
1 job for 3.7.1-dev in 0 seconds (queued for 1 minute and 35 seconds)