Merge commit 'b73a45352ea323057895b23e8393e57f199503b6' into 3.0

Conflicts:
	00-RELEASENOTES
	tests/sentinel.tcl
Merge branch 'unstable' into 3.0

Conflicts:
	tests/sentinel.tcl
Removed file added that should not be here...
Merge branch 'unstable' of https://github.com/jorgeuriarte/redis into unstable