Merge pull request #6975 from herbdool/master-redis