Merge commit 'df270ef74596da8f1178f08991f4c51f18c9ee82' into concedo_experimental

# Conflicts:
#	Makefile
#	common/CMakeLists.txt
#	common/common.h
#	common/sampling.cpp
#	common/sampling.h
#	examples/infill/infill.cpp
#	examples/llama-bench/llama-bench.cpp
#	examples/quantize-stats/quantize-stats.cpp
#	examples/server/server.cpp
#	include/llama.h
#	src/llama-sampling.cpp
#	src/llama-sampling.h
#	src/llama.cpp
#	tests/test-grammar-integration.cpp
#	tests/test-grammar-parser.cpp
#	tests/test-json-schema-to-grammar.cpp
#	tests/test-llama-grammar.cpp
#	tests/test-sampling.cpp

.gitignore

@@ -89,7 +89,6 @@ poetry.toml
 ggml-metal-merged.metal
 
 # Test binaries
-tests/test-grammar-parser
 /tests/test-llama-grammar
 tests/test-double-float
 tests/test-grad0