Merge pull request #1955 from dennishendriksen/master

Elasticsearch batching fix