Sync v2.6 with addons.mozilla.org