Dev 2.0

thepaeth requested to merge dev-2.0 into master

Merge request reports