Partially fixes font merge for Tekyla
Merge branch 'master' of github.com:ekylibre/ekylibre