Updated Elasticsearch module
Merge branch 'release/v0.6.4'