Merge branch '2.6.1-dev' into 'master'

2.6.1 dev

See merge request !13
5 jobs for master