Conflicts:
	src/lua/fiber.cc
	src/lua/msgpackffi.lua
	test/big/iterator.result
	test/big/lua.result
	test/box/msgpack.result
	third_party/lua-yaml/lyaml.cc