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