Allow Redis connection to be configurable.
Merge branch '4.0'