Revert "Merge branch 'thomasrehm'"

This reverts commit 874234634c65d4f28743ea01516973479ed80ed0, reversing
changes made to 75cb606968d41110e8d652acf2310c5f75c6df69.
Revert "Revert "Merge branch 'thomasrehm'""

This reverts commit f2deeea34dab179efc7b40f6e4b26a30c990c3fc.
Fehler behoben aus comitzeuch