V0.4.6 bugfixes

Merged Markus Scheidgen requested to merge v0.4.6-bugfixes into master

Merge request reports