Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
(cherry picked from commit 6d4a41a6e779e606c8ffd212948535f9e46691c1)