Fixes compile error after refactor
Merge remote-tracking branch 'origin/master' into truetype