forwardport of 3bde20b52de75861c3c200e4d55b93dad1d6a6b1 from vlc-2.1.git.
Attach a file by drag & drop or click to upload
