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

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