Merge branch 'devel_15.1.x' into 'devel_16.0.x'

Devel 15.1.x

See merge request !1331
41 jobs for devel_16.0.x in 18 minutes and 57 seconds (queued for 7 seconds)