fix #2185
Merge branch '2.3.x' of github.com:mapnik/mapnik into offset-debug