API: Toten Code entfernen
Merge branch 'master' into otsv