Signed-off-by: Martin Schiller <ms@dev.tdt.de> (backported from a904003b9b5fe2744ee5d5d8718c54d001f1c93e)