Merge some lost contributions from upstream