Remove "ads" row from upgrade info page (fixes #2094)
Fix hash key typo in TagAliasCorrection
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into ajido