Merge remote-tracking branch 'Firefox-Addon-Bar--Restored/master'