Updated for Redis 2.6.9