Support redis-unstable
Merge remote-tracking branch 'upstream/master' into upstream

Conflicts:
	.gitignore
Support redis-unstable