Merge pull request #795 from annando/twitter-notice