Close #5909 #5867
(cherry picked from commit f86e5ebbc95af8c0bcb8bcaa9ea6407fa69c0765)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>