Redis 2.6.15
Merge remote-tracking branch 'antirez/2.6' into 2.6