Merge remote-tracking branch 'flexget/master'