Merge branch 'cython' into next