merge commits from antirez