Merged all the changes from the branch which incorporated redis.