Closes blocker #3262
(cherry picked from commit d24e45887e24bb45da8c7a55263a47d0bf548da3)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>