Merged in 2.6.17 changes from antirez