Pull now-stabilized dev branch in to master

There are some potentially-destabilizing changes on the way. Merge in to master so that we can keep doing releases while I work through the debug process in `dev`.