Merge in latest devel for more tests

Oliver Falkrequested to merge
devel into master

Merge request reports