Merge "Fix bad doxygen tags in font headers."