Bug 817023 [Browser] Characters are underlined in Top Sites list
Merge pull request #6838 from benfrancis/browser-awesomescreen

Bug 817023 [Browser] Characters are underlined in Top Sites list
Auto-merge from branch 'master'