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

A few manual merges... nothing too bad.