Merge pull request #872 from annando/twitter-image