Merge branch 'master' into cff-subset

diff --cc src/hb-null.hh
Simple merge

diff --cc src/hb-ot-face.hh
index 72e4495,caa1d97..9719ad4
--- 1/src/hb-ot-face.hh
--- 2/src/hb-ot-face.hh
+++ b/src/hb-ot-face.hh
@@@ -67,10 -67,8 +67,10 @@@
      HB_OT_ACCELERATOR(OT, hmtx) \
      HB_OT_ACCELERATOR(OT, vmtx) \
      HB_OT_ACCELERATOR(OT, post) \
-     HB_OT_ACCELERATOR(OT, kern) \
+     HB_OT_TABLE(OT, kern) \
      HB_OT_ACCELERATOR(OT, glyf) \
 +    HB_OT_ACCELERATOR(OT, cff1) \
 +    HB_OT_ACCELERATOR(OT, cff2) \
      HB_OT_TABLE(OT, VORG) \
      HB_OT_ACCELERATOR(OT, name) \
      HB_OT_TABLE(AAT, ltag) \

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

diff --cc test/api/Makefile.am
Simple merge