Some corrections
Translated latest fixes from lionel-m to german
Merge branch '3.0' into 3.1