Merge branch 'hotfix/docs'
Merge branches 'master' and 'master' of https://github.com/chrippa/livestreamer