re-implement f866ab1f80ad2e1e183a7521850837bc92b5726b and da53af5c980c4092fb11208de5979bf63ae6595c (re-closing #1277) since somehow these commits dissapeared from master
re-implement f866ab1f80ad2e1e183a7521850837bc92b5726b and da53af5c980c4092fb11208de5979bf63ae6595c (re-closing #1277) since somehow these commits dissapeared from master

manz/python-mapnik,Airphrame/mapnik,Airphrame/mapnik,stefanklug/mapnik,mbrukman/mapnik,mapycz/mapnik,qianwenming/mapnik,pramsey/mapnik,pnorman/mapnik,mapnik/mapnik,rouault/mapnik,manz/python-mapnik,whuaegeanse/mapnik,garnertb/python-mapnik,rouault/mapnik,garnertb/python-mapnik,kapouer/mapnik,cjmayo/mapnik,strk/mapnik,sebastic/python-mapnik,yohanboniface/python-mapnik,mapnik/python-mapnik,kapouer/mapnik,kapouer/mapnik,Uli1/mapnik,yohanboniface/python-mapnik,zerebubuth/mapnik,pramsey/mapnik,naturalatlas/mapnik,Mappy/mapnik,strk/mapnik,rouault/mapnik,mapnik/mapnik,pramsey/mapnik,Uli1/mapnik,yiqingj/work,CartoDB/mapnik,cjmayo/mapnik,qianwenming/mapnik,mapycz/mapnik,jwomeara/mapnik,mbrukman/mapnik,mapycz/python-mapnik,davenquinn/python-mapnik,mbrukman/mapnik,Mappy/mapnik,davenquinn/python-mapnik,davenquinn/python-mapnik,tomhughes/mapnik,stefanklug/mapnik,zerebubuth/mapnik,tomhughes/mapnik,Airphrame/mapnik,Uli1/mapnik,lightmare/mapnik,mapycz/python-mapnik,cjmayo/mapnik,qianwenming/mapnik,tomhughes/mapnik,pnorman/mapnik,jwomeara/mapnik,tomhughes/mapnik,lightmare/mapnik,mapnik/python-mapnik,mapnik/mapnik,mapnik/mapnik,naturalatlas/mapnik,naturalatlas/mapnik,yiqingj/work,Mappy/mapnik,strk/mapnik,sebastic/python-mapnik,whuaegeanse/mapnik,mapnik/python-mapnik,whuaegeanse/mapnik,CartoDB/mapnik,pramsey/mapnik,whuaegeanse/mapnik,tomhughes/python-mapnik,tomhughes/python-mapnik,jwomeara/mapnik,lightmare/mapnik,Airphrame/mapnik,stefanklug/mapnik,mapycz/mapnik,zerebubuth/mapnik,sebastic/python-mapnik,tomhughes/python-mapnik,kapouer/mapnik,yiqingj/work,stefanklug/mapnik,lightmare/mapnik,naturalatlas/mapnik,pnorman/mapnik,pnorman/mapnik,qianwenming/mapnik,manz/python-mapnik,rouault/mapnik,Mappy/mapnik,cjmayo/mapnik,Uli1/mapnik,garnertb/python-mapnik,mbrukman/mapnik,CartoDB/mapnik,strk/mapnik,qianwenming/mapnik,yohanboniface/python-mapnik,jwomeara/mapnik,yiqingj/work