Occasional merge towards v0.4.4

Merged Markus Scheidgen requested to merge experimental into master

Merge request reports