[fix bug 1014648] Loading /firefox/desktop/tips/ with a hash should not scroll the page
Merge pull request #2042 from mozilla/bug-1014648-tips-page-hash-scroll

[fix bug 1014648] Loading /firefox/desktop/tips/ with a hash should not scroll the page
Bug 978999 - grammar issue
Merge pull request #2045 from retornam/bug-978999-fix-grammar

Bug 978999 - grammar issue