Merge pull request #1 from elasticsearch/master

2-17