Merge branch 'elasticsearch'

# Conflicts:
#	README.md
