Pull upstream changes from ufo2fdk
Pull upstream changes from ufo2fdk

Incorporates the following commits from ufo2fdk:
1d5cdc6a98688fbf60b8db37ad9e9c4d44686204
8713490e761026c6ec663dcfabc74112c288f2f6

jamesgk/ufo2ft,moyogo/ufo2ft,jamesgk/ufo2fdk,googlefonts/ufo2ft,googlei18n/ufo2ft