And close #4542
(cherry picked from commit d3c77e33205db2859a6d1f1594ae8efd82e7fd3b)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>