Merge branch 'master'textmetrics
Merge branch 'master'