convert tabs into spaces
basic messaging shim for Firefox to be compatible with our messaging interface
merge conflict
Merge remote-tracking branch 'origin/firefox' into firefox