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