And close #6536
(cherry picked from commit 5a2390a78863423a6b5108debd1c6939ac5ab38a)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>