[crux-commits] ports/contrib (3.6): grim: cherry picked a commit from upstream