Sync contrib to HEAD via Makefile