merged in latest cython-devel