And also, close #5522
(cherry picked from commit 921a659cf599ac0afd943aeed0a4fc085cc4f24f)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>