Conflicts:
	.gitignore
	cmake/BuildMisc.cmake
	cmake/compiler.cmake
	include/avl_tree.h
	src/box/avl_tree_index.h
	test/unit/avl_tree.c
	third_party/qsort_arg_mt.c