Merge branch '3.5.1-dev' into 'master'

Merge 3.5.1-dev into master

See merge request !17
1 job for 3.6.1-dev in 0 seconds (queued for 10 seconds)