timeout=False to cursor
Merge remote-tracking branch 'origin/design-2012-11-13' into design-2012-11-13