Merge branch 'master' into use-other-downloaders
Merge branch 'use-other-downloaders' of github.com:rbrito/youtube-dl into use-other-downloaders