Fix empty custom fonts type
Merge remote-tracking branch 'origin/master'