First try, workaround for issue 6086
Merge branch 'issue6086'
Update version number
Remove most remaining instances of "with (Domplate)"
Merge branch 'master' into jsd2

Conflicts:
	extension/content/firebug/console/commands/profiler.js
	extension/content/firebug/js/debugger.js
Remove instances of "with (Domplate)" (jsd2 changes)