Deploy 2.1.1

Merged Ruben Backx requested to merge dev into master

Merge request reports