Merge branch 'upstream/master'
Fix : Bad glyph render due to CG filtering (by adding a border)