(cherry picked from commit 3e954c98)
(cherry picked from commit 0f82e032)
(cherry picked from commit f559e33c)
(cherry picked from commit 67b2f035)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>