This patch refers to trac #3594.
Tests required to ensure that it really solves the "Docky" issue
(cherry picked from commit 7df27870)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>