Really merge upstream fixes for proximity grenades

who knew merging could be so much fun?