Merge pull request #907 from annando/twitter-logging