Time to sync master with staging again

`master` is nearly a hundred commits behind `staging`, and it's especially important to bring in the documentation fixes

It'd probably be a good idea to first merge PR #476 before merging this PR, unless there's some pressing reason to wait on merging that other PR.