elasticsearch 0.90.1 compatibility
Merge branch 'master' into es-0-90-1

Conflicts:
	CHANGES.txt