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