Remove wrong second argument + Use module directly (no Firebug namespace)
Merge branch 'master' into issue6821