Merge pull request #390 from annando/1612-twitter-api-changes