Downloader twisted compat fix
Merge remote-tracking branch 'upstream/master'