Merge branch 'master' into stylesheet-refactoring

This branch has gotten much further ahead of the original master branch,
and is for all intents and purposes the new master branch.
Bad practice, I know, lesson learned.