another merge fix
another merge fix

hhsprings/cython,andreasvc/cython,JelleZijlstra/cython,slonik-az/cython,fabianrost84/cython,encukou/cython,acrispin/cython,c-blake/cython,fabianrost84/cython,JelleZijlstra/cython,JelleZijlstra/cython,mrGeen/cython,mrGeen/cython,mcanthony/cython,fperez/cython,achernet/cython,acrispin/cython,roxyboy/cython,achernet/cython,roxyboy/cython,hhsprings/cython,slonik-az/cython,rguillebert/CythonCTypesBackend,bzzzz/cython,slonik-az/cython,roxyboy/cython,hpfem/cython,mrGeen/cython,andreasvc/cython,andreasvc/cython,slonik-az/cython,mcanthony/cython,rguillebert/CythonCTypesBackend,hpfem/cython,hhsprings/cython,larsmans/cython,JelleZijlstra/cython,fperez/cython,hickford/cython,hhsprings/cython,scoder/cython,slonik-az/cython,scoder/cython,c-blake/cython,JelleZijlstra/cython,hpfem/cython,da-woods/cython,da-woods/cython,mrGeen/cython,larsmans/cython,encukou/cython,madjar/cython,encukou/cython,hickford/cython,fperez/cython,mcanthony/cython,cython/cython,dahebolangkuan/cython,rguillebert/CythonCTypesBackend,fperez/cython,hpfem/cython,roxyboy/cython,ChristopherHogan/cython,dahebolangkuan/cython,fabianrost84/cython,achernet/cython,acrispin/cython,bzzzz/cython,fabianrost84/cython,dahebolangkuan/cython,cython/cython,scoder/cython,dahebolangkuan/cython,marscher/cython,andreasvc/cython,larsmans/cython,larsmans/cython,ABcDexter/cython,mcanthony/cython,marscher/cython,ABcDexter/cython,ABcDexter/cython,madjar/cython,madjar/cython,mcanthony/cython,madjar/cython,encukou/cython,dahebolangkuan/cython,c-blake/cython,da-woods/cython,hickford/cython,mrGeen/cython,hhsprings/cython,ChristopherHogan/cython,ABcDexter/cython,rguillebert/CythonCTypesBackend,c-blake/cython,marscher/cython,acrispin/cython,ABcDexter/cython,hpfem/cython,c-blake/cython,da-woods/cython,bzzzz/cython,bzzzz/cython,marscher/cython,encukou/cython,madjar/cython,fperez/cython,andreasvc/cython,fabianrost84/cython,larsmans/cython,marscher/cython,cython/cython,achernet/cython,acrispin/cython,hickford/cython,hickford/cython,roxyboy/cython,scoder/cython,cython/cython,ChristopherHogan/cython,achernet/cython