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