Ready to merge

Checks pass, no conflict, the current head is approved, and a review on it earned credit. Ordered by the author's credit, so people who review rise. Work it from the top.