merge 0.18.x branch back into master
merge 0.18.x branch back into master

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