Conflicts:
	Cython/Compiler/Options.py

.# Please enter the commit message for your changes. Lines starting

only include CythonFunction utility code if it's really used, might be unused if .pxd overrides all def functions to cdef