Merge branches 'font-enhancement' and 'dashes' into trunk