Dev

Merged Matti Hyttinen requested to merge dev into master

Bugfixes

Merge request reports