Backport fix for tornado issue #489 from tornado
Backport fix for tornado issue #489 from tornado

lextoumbourou/cyclone,shirk3y/cyclone,fiorix/cyclone,dpnova/cyclone,dpnova/cyclone,fiorix/cyclone,dpnova/cyclone,fiorix/cyclone,lextoumbourou/cyclone,lextoumbourou/cyclone,dpnova/cyclone,shirk3y/cyclone,shirk3y/cyclone