Mmtest

Monkenbusch, Michaelrequested to merge
mmtest into master

I merged my latest (local) mmtest with the devel version and pushed it back to mmtest TBD: update devel and master branches

Merge request reports