Merge release-2.x.y branch into default.

Clean merge, apart from the .tx/config change that we don't want here.