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