Improve patch for issue 6583
Merge branch 'master' of github.com:firebug/firebug