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