Merge branch 'master' of https://github.com/numa1985/flexget-config