Sync v2.7 with addons.mozilla.org