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