3.0.0 wip

sync with twitter 3.0.0 branch