merge 0.22.x branch into master
merge 0.22.x branch into master

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