Fix for issues #2959 and #2960#2961

monkey92t merged 2 commits intoredis:masterredis/go-redis:masterfrom

singular-seal:mastersingular-seal/go-redis:masterCopy head branch name to clipboard