Merge 16.1.1

Merged Piotr Gawron requested to merge merge-16.1.1 into master

Merge request reports