Merge branch 'font-enhancement' into trunk