Merge pull request #2260 from bufadu/evol_redis