Merge branch 'master' into cff-subset

diff --cc src/Makefile.sources
Simple merge

diff --cc src/hb-ot-face.hh
Simple merge

diff --cc test/api/Makefile.am
index bd5f13a,4c32940..02c7f49
--- 1/test/api/Makefile.am
--- 2/test/api/Makefile.am
+++ b/test/api/Makefile.am
@@@ -78,9 -74,9 +78,10 @@@ endi
  
  TEST_PROGS += \
        test-ot-color \
+       test-ot-ligature-carets \
        test-ot-name \
        test-ot-tag \
 +      test-ot-extents-cff \
        $(NULL)