Merge in latest devel tree

Oliver Falkrequested to merge
devel into master

Merge request reports