Fix remove extra commas
Fix wrong var name for json fonts import
Merge remote-tracking branch 'origin/master' into custom