This closes #3793 and #3779
(cherry picked from commit aeb4a8149ba23975e4ed411f41fc60f4943e2f66)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>