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

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