Feel free to backport, I don't have the branch yet..
(cherry picked from commit 05d60d9e)
Signed-off-by: Christophe Mutricy <xtophe@videolan.org>