Work around assign-to-reference bug in Cython >=0.18.
Merge branch '20140904-riastradh-cython0.18-fixes'