Version 1.2.1

Merged Ruben Backx requested to merge development into master

Merge request reports