Merge branch 'master' into cff-subset

diff --cc test/api/Makefile.am
index 871bd3e,3ff7f5a..03cf815
--- 1/test/api/Makefile.am
--- 2/test/api/Makefile.am
+++ b/test/api/Makefile.am
@@@ -76,11 -72,9 +76,10 @@@ endi
  TEST_PROGS += \
        test-ot-color \
        test-ot-tag \
 +      test-ot-extents-cff \
        $(NULL)
  
+ 
  if HAVE_PTHREAD
  if HAVE_FREETYPE
  TEST_PROGS += test-multithread