Merge commit 'ae538a0b' into HEAD

Commit

2 years ago

Merge commit 'ae538a0b' into HEAD # Conflicts: # src/transformers/models/gemma/modeling_gemma.py