Merge with upstream, reverse changeset 4e24288
since it brokes TTF on linux
This commit is contained in:
commit
dd923d5aea
4e24288
since it brokes TTF on linux