Merge branch '3.5.1-dev' into 'master'

merge 3.5.1 dev into master

See merge request !3
3 jobs for master