11.0.5 and 11.0.6 merged into master

Merged Piotr Gawron requested to merge devel_11.1.x into master

Merge request reports