Merge branch 'master' of https://github.com/harfbuzz/harfbuzz into drophints

diff --cc src/hb-subset-glyf.cc
Simple merge

diff --cc src/hb-subset-plan.cc
Simple merge

diff --cc src/hb-subset.cc
index c708e19,12cdb1d..cba0517
--- 1/src/hb-subset.cc
--- 2/src/hb-subset.cc
+++ b/src/hb-subset.cc
@@@ -229,9 -238,11 +238,12 @@@ _subset_table (hb_subset_plan_t *plan
      case HB_OT_TAG_glyf:
        result = _subset<const OT::glyf> (plan);
        break;
+     case HB_OT_TAG_hdmx:
+       result = _subset<const OT::hdmx> (plan);
+       break;
      case HB_OT_TAG_head:
 -      // SKIP head, it's handled by glyf
 +      // TODO that won't work well if there is no glyf
 +      DEBUG_MSG(SUBSET, nullptr, "skip head, handled by glyf");
        result = true;
        break;
      case HB_OT_TAG_hhea:

diff --cc util/options.cc
Simple merge

diff --cc util/options.hh
Simple merge