It closes #2812, #3197 and #3533.
(cherry picked from commit 36b00563093419dfb85d313c533a8b68bf5b2318)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>