start of redis branch (master)