Merge branch 'master' of https://github.com/aurium/youtube-dl into aurium-master