Merge branch 'devel' into oliver-master-patch-31818

2 jobs for oliver-master-patch-31818 in 13 minutes and 10 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #4783
pycco

00:04:38

passed #4782
test_and_coverage

00:10:47

71.0%