Distributed Merge into Master Branch

Stefan Gebhartrequested to merge
Master-Distributed-Merge into master

Prism and Random WTA not really checked, since i haven't looked at them that thoroughly yet.

Merge request reports