update truetype branch with master changes