Commit tterribe's port of Tremor r17541: