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