Merge remote-tracking branch 'upstream/master' into jsd2
Merge branch 'jsd2' of https://github.com/firebug/firebug into jsd2