Merge pull request #2705 from kakysha/develop

Better Redis connection handling