Conflicts: bindings/python/mapnik/__init__.py include/mapnik/font_engine_freetype.hpp src/load_map.cpp