Merge branch '2.6.1-dev' into 'master'

2.6.1 dev

See merge request !13
5 jobs for master (queued for 9 minutes and 49 seconds)
Status Job ID Name Coverage
  External
passed jenkins

00:06:15

pending Resolve
pending Validate
passed jenkins

00:06:41

passed jenkins

00:09:23