It closes #3538 and #3496.
(cherry picked from commit 95f32b1bf51a5bb03488a59f18feac42b80479d4)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>