Merge for release v0.9.5

Merged Markus Scheidgen requested to merge v0.9.5 into master

Merge request reports