Merge redis into master