Merge remote-tracking branch 'origin/master' into refactoring/extract-rake-task-logic

Conflicts:
	lib/elasticsearch-rake-tasks.rake