main
Merge the rest of the trunk.
Unmark files as executable that can't actually be executed. (GH-15353)