fix #2283
Merge branch 'master' of github.com:mapnik/mapnik