Should close #3536
(cherry picked from commit 89f5d36846718c86518e11d6f542e61b8823b5ab)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>