Correctly handle `from cython.submodule comport name``.
cython submodule cimport test
Merge branch '0.20.x'

Conflicts:
	CHANGES.rst