Mixed improvements

Bastian Germannrequested to merge
(removed):debian/master into debian/master

This holds some improvements which are independent from each other.

Merge request reports