don't ask people to change their code
Merge branch 'master' of https://github.com/mentionapp/elasticsearch