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