Updated 2.6 source from antirez