update
Merge branch 'master' of https://github.com/Saboti/.flexget
update