Merge for release

Merged Markus Scheidgen requested to merge v0.10.7 into master
Edited by Markus Scheidgen

Merge request reports