Bringing working up to speed with master

The `master` branch has three non-merge commits that should be brought into `working`. This PR brings these commits over.