Stable 3.1

Marius Burkardrequested to merge
stable-3.1 into master

Merge after adding the strip down changes to master branch.

Merge request reports