stuff

Merged Jakob Knollmueller requested to merge master into nifty4

Merge request reports