nathans pushed to redis (master). "Update to upstream v6 release; add fixes from Remi"