Stub for firefox addon
Merge remote-tracking branch 'origin/master' into dc2