(cherry picked from commit c57d47db)
(cherry picked from commit 753a7d15)
(cherry picked from commit 1ef8da27)
(cherry picked from commit 44676a05)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>