Rollup of changes

Changes authored by me have not yet been reviewed; the other changes have.

r? @metajack