Update Josiah's copy to latest d692e87

Sorry if this show's up in Tim's repo, just testing.