Merged latest changes from fontstash

- merged font stash optional FreeType support