antirez/redis — pull request #1366 by yaauie (2013-11-06 09:24:33+00:00)
Title: 2.6 branch backport of #1365

#1365, cherry-picked for 2.6 branch.