65d98d8fd
This marks stable-2.2 as merged up to 65d98d8fd, though the merge was done via cherry-picks.