Merge commit '1ea60c472c21db87f07cd81c4df440046a907cfd' into harfbuzz

Conflicts:
	include/mapnik/font_engine_freetype.hpp
	src/font_engine_freetype.cpp

src/font_engine_freetype.cpp

@@ -226,6 +226,7 @@ face_ptr face_manager<T>::get_face(const std::string &name)
     face_ptr_cache_type::iterator itr;
     itr = face_ptr_cache_.find(name);
     if (itr != face_ptr_cache_.end())
+    {
     {
         return itr->second;
     }