Merged to connect-redis 2.0, and some other changes