Stable 3.0.5

Marius Burkardrequested to merge
stable-3.0.5 into master

Merge current stable to master, just to have smaller merge later and to prepare tidying of code.

Merge request reports