Patch 4

Merged Oskar van Deventer requested to merge patch-4 into master

Merge request reports