Signed-off-by: David Bauer <mail@david-bauer.net> (cherry picked from commit 55ed4bf6d7bf80b705d015c3b73f772db485ba9c)