Merge pull request #1 from videolan/master

Merge