Bringing working up to speed with master

The `master` branch has a few non-merge commits that should be brought into `working`.