updates
Merge remote-tracking branch 'origin/test' into test

Conflicts:
	etc/elasticsearch/elasticsearch.yml