Conflicts:
	src/codegen/irgen.h
	src/codegen/irgen/irgenerator.cpp
	src/codegen/unwinding.cpp
	src/core/types.h

Some other merge changes as well