Bugfix/warnings

Sebastian Henzrequested to merge
bugfix/warnings into master

Implement just the warnings and options fix in the current master branch because that stuff has to work in the release before I merge v2.0.

Edited by Sebastian Henz

Merge request reports