elasticsearch/elasticsearch — pull request #3535 by brwe (2013-08-19 14:21:49+00:00)
Title: Feature/issue 3533 and 3464

branch for issue [3533](https://github.com/elasticsearch/elasticsearch/issues/3533) and issue [3464](https://github.com/elasticsearch/elasticsearch/issues/3464), see commit messages