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