This closes #6064
(cherry picked from commit 7c693f065ba6866575f8db8a45156d2f370f848c)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>