some maintaining stuff

Merged Philip H requested to merge maintainance into master
Edited by Philip H

Merge request reports