Conf 11

Reiner Jung requested to merge conf-11 into master

Added diagnostics support.

Merge request reports