Mergin of changes by hatorikibble for Twitter API updates.