diff --git a/browser/devtools/commandline/gcli.jsm b/browser/devtools/commandline/gcli.jsm
index 292c7b918883..757759744fc4 100644
--- a/browser/devtools/commandline/gcli.jsm
+++ b/browser/devtools/commandline/gcli.jsm
@@ -4,6 +4,16 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
 "use strict";
 
 
@@ -26,6 +36,16 @@ Components.utils.import("resource:///modules/devtools/Browser.jsm");
 
 
 
+
+
+
+
+
+
+
+
+
+
 var mozl10n = {};
 
 (function(aMozl10n) {
@@ -118,6 +138,16 @@ define('gcli/index', ['require', 'exports', 'module' , 'gcli/types/basic', 'gcli
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gcli/types/basic', ['require', 'exports', 'module' , 'gcli/l10n', 'gcli/types', 'gcli/types/spell', 'gcli/types/selection', 'gcli/argument'], function(require, exports, module) {
 
 
@@ -478,6 +508,16 @@ exports.ArrayType = ArrayType;
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gcli/l10n', ['require', 'exports', 'module' ], function(require, exports, module) {
 
 Components.utils.import('resource://gre/modules/XPCOMUtils.jsm');
@@ -558,6 +598,16 @@ exports.lookupFormat = function(key, swaps) {
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gcli/types', ['require', 'exports', 'module' , 'gcli/argument'], function(require, exports, module) {
 var types = exports;
 
@@ -1060,6 +1110,16 @@ types.getType = function(typeSpec) {
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gcli/argument', ['require', 'exports', 'module' ], function(require, exports, module) {
 var argument = exports;
 
@@ -1672,6 +1732,16 @@ exports.Speller = Speller;
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gcli/types/selection', ['require', 'exports', 'module' , 'gcli/l10n', 'gcli/types', 'gcli/types/spell'], function(require, exports, module) {
 
 
@@ -1965,6 +2035,16 @@ exports.SelectionType = SelectionType;
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gcli/types/command', ['require', 'exports', 'module' , 'gcli/canon', 'gcli/l10n', 'gcli/types', 'gcli/types/selection'], function(require, exports, module) {
 
 
@@ -2070,6 +2150,16 @@ CommandType.prototype.parse = function(arg) {
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gcli/canon', ['require', 'exports', 'module' , 'gcli/util', 'gcli/l10n', 'gcli/types', 'gcli/types/basic'], function(require, exports, module) {
 var canon = exports;
 
@@ -2467,6 +2557,16 @@ canon.commandOutputManager = new CommandOutputManager();
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gcli/util', ['require', 'exports', 'module' ], function(require, exports, module) {
 
 
@@ -3161,6 +3261,16 @@ else {
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gcli/types/javascript', ['require', 'exports', 'module' , 'gcli/l10n', 'gcli/types'], function(require, exports, module) {
 
 
@@ -3712,6 +3822,16 @@ exports.JavascriptType = JavascriptType;
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gcli/types/node', ['require', 'exports', 'module' , 'gcli/host', 'gcli/l10n', 'gcli/types'], function(require, exports, module) {
 
 
@@ -3825,6 +3945,16 @@ NodeType.prototype.name = 'node';
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gcli/host', ['require', 'exports', 'module' ], function(require, exports, module) {
 
 
@@ -3861,6 +3991,16 @@ define('gcli/host', ['require', 'exports', 'module' ], function(require, exports
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gcli/types/resource', ['require', 'exports', 'module' , 'gcli/types', 'gcli/types/selection'], function(require, exports, module) {
 
 
@@ -4166,6 +4306,16 @@ var ResourceCache = {
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gcli/types/setting', ['require', 'exports', 'module' , 'gcli/settings', 'gcli/types', 'gcli/types/selection', 'gcli/types/basic'], function(require, exports, module) {
 
 
@@ -4262,6 +4412,16 @@ SettingValueType.prototype.name = 'settingValue';
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gcli/settings', ['require', 'exports', 'module' , 'gcli/util', 'gcli/types'], function(require, exports, module) {
 
 var imports = {};
@@ -4488,6 +4648,16 @@ exports.removeSetting = function(nameOrSpec) {
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gcli/ui/intro', ['require', 'exports', 'module' , 'gcli/settings', 'gcli/l10n', 'gcli/util', 'gcli/ui/view', 'gcli/cli', 'text!gcli/ui/intro.html'], function(require, exports, module) {
 
   var settings = require('gcli/settings');
@@ -4565,6 +4735,16 @@ define('gcli/ui/intro', ['require', 'exports', 'module' , 'gcli/settings', 'gcli
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gcli/ui/view', ['require', 'exports', 'module' , 'gcli/util', 'gcli/ui/domtemplate'], function(require, exports, module) {
 
 
@@ -4645,6 +4825,16 @@ exports.createView = function(options) {
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gcli/ui/domtemplate', ['require', 'exports', 'module' ], function(require, exports, module) {
 
   var obj = {};
@@ -4658,6 +4848,16 @@ define('gcli/ui/domtemplate', ['require', 'exports', 'module' ], function(requir
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gcli/cli', ['require', 'exports', 'module' , 'gcli/util', 'gcli/ui/view', 'gcli/canon', 'gcli/promise', 'gcli/types', 'gcli/types/basic', 'gcli/argument'], function(require, exports, module) {
 
 
@@ -6269,6 +6469,16 @@ exports.createExecutionContext = function(requisition) {
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gcli/promise', ['require', 'exports', 'module' ], function(require, exports, module) {
 
   Components.utils.import("resource:///modules/devtools/Promise.jsm");
@@ -6296,6 +6506,16 @@ define("text!gcli/ui/intro.html", [], "\n" +
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gcli/ui/focus', ['require', 'exports', 'module' , 'gcli/util', 'gcli/settings', 'gcli/l10n', 'gcli/canon'], function(require, exports, module) {
 
 
@@ -6693,6 +6913,16 @@ exports.FocusManager = FocusManager;
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gcli/ui/fields/basic', ['require', 'exports', 'module' , 'gcli/util', 'gcli/l10n', 'gcli/argument', 'gcli/types', 'gcli/types/basic', 'gcli/ui/fields'], function(require, exports, module) {
 
 
@@ -7063,6 +7293,16 @@ ArrayField.prototype._onAdd = function(ev, subConversion) {
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gcli/ui/fields', ['require', 'exports', 'module' , 'gcli/util', 'gcli/types/basic'], function(require, exports, module) {
 
 
@@ -7301,6 +7541,16 @@ exports.addField(BlankField);
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gcli/ui/fields/javascript', ['require', 'exports', 'module' , 'gcli/util', 'gcli/argument', 'gcli/types/javascript', 'gcli/ui/fields/menu', 'gcli/ui/fields'], function(require, exports, module) {
 
 
@@ -7435,6 +7685,16 @@ JavascriptField.DEFAULT_VALUE = '__JavascriptField.DEFAULT_VALUE';
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gcli/ui/fields/menu', ['require', 'exports', 'module' , 'gcli/util', 'gcli/argument', 'gcli/canon', 'gcli/ui/domtemplate', 'text!gcli/ui/fields/menu.css', 'text!gcli/ui/fields/menu.html'], function(require, exports, module) {
 
 
@@ -7650,6 +7910,16 @@ define("text!gcli/ui/fields/menu.html", [], "\n" +
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gcli/ui/fields/selection', ['require', 'exports', 'module' , 'gcli/util', 'gcli/l10n', 'gcli/argument', 'gcli/types', 'gcli/types/basic', 'gcli/types/selection', 'gcli/ui/fields/menu', 'gcli/ui/fields'], function(require, exports, module) {
 
 
@@ -7850,6 +8120,16 @@ SelectionTooltipField.DEFAULT_VALUE = '__SelectionTooltipField.DEFAULT_VALUE';
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gcli/commands/help', ['require', 'exports', 'module' , 'gcli/canon', 'gcli/l10n', 'gcli/util', 'gcli/ui/view', 'text!gcli/commands/help_man.html', 'text!gcli/commands/help_list.html', 'text!gcli/commands/help.css'], function(require, exports, module) {
 var help = exports;
 
@@ -8094,6 +8374,16 @@ define("text!gcli/commands/help.css", [], "");
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gcli/commands/pref', ['require', 'exports', 'module' , 'gcli/canon', 'gcli/l10n', 'gcli/settings', 'text!gcli/commands/pref_set_check.html'], function(require, exports, module) {
 
 
@@ -8239,6 +8529,16 @@ define("text!gcli/commands/pref_set_check.html", [], "<div>\n" +
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gcli/ui/ffdisplay', ['require', 'exports', 'module' , 'gcli/ui/inputter', 'gcli/ui/completer', 'gcli/ui/tooltip', 'gcli/ui/focus', 'gcli/cli', 'gcli/types/javascript', 'gcli/types/node', 'gcli/types/resource', 'gcli/host', 'gcli/ui/intro', 'gcli/canon'], function(require, exports, module) {
 
 var Inputter = require('gcli/ui/inputter').Inputter;
@@ -8481,6 +8781,16 @@ exports.FFDisplay = FFDisplay;
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gcli/ui/inputter', ['require', 'exports', 'module' , 'gcli/util', 'gcli/types', 'gcli/history', 'text!gcli/ui/inputter.css'], function(require, exports, module) {
 
 
@@ -9031,6 +9341,16 @@ exports.Inputter = Inputter;
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gcli/history', ['require', 'exports', 'module' ], function(require, exports, module) {
 
 
@@ -9096,6 +9416,16 @@ define("text!gcli/ui/inputter.css", [], "");
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gcli/ui/completer', ['require', 'exports', 'module' , 'gcli/util', 'gcli/ui/domtemplate', 'text!gcli/ui/completer.html'], function(require, exports, module) {
 
 
@@ -9369,6 +9699,16 @@ define("text!gcli/ui/completer.html", [], "\n" +
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gcli/ui/tooltip', ['require', 'exports', 'module' , 'gcli/util', 'gcli/cli', 'gcli/ui/fields', 'gcli/ui/domtemplate', 'text!gcli/ui/tooltip.css', 'text!gcli/ui/tooltip.html'], function(require, exports, module) {
 
 
diff --git a/browser/devtools/commandline/test/browser_gcli_web.js b/browser/devtools/commandline/test/browser_gcli_web.js
index 661c0e28791d..6085a6db4663 100644
--- a/browser/devtools/commandline/test/browser_gcli_web.js
+++ b/browser/devtools/commandline/test/browser_gcli_web.js
@@ -31,6 +31,16 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -65,6 +75,16 @@ registerCleanupFunction(function tearDown() {
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gclitest/index', ['require', 'exports', 'module' , 'gclitest/suite'], function(require, exports, module) {
 
   var examiner = require('gclitest/suite').examiner;
@@ -116,6 +136,16 @@ define('gclitest/index', ['require', 'exports', 'module' , 'gclitest/suite'], fu
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gclitest/suite', ['require', 'exports', 'module' , 'gcli/index', 'test/examiner', 'gclitest/testCanon', 'gclitest/testCli', 'gclitest/testCompletion', 'gclitest/testExec', 'gclitest/testHelp', 'gclitest/testHistory', 'gclitest/testInputter', 'gclitest/testIntro', 'gclitest/testJs', 'gclitest/testKeyboard', 'gclitest/testPref', 'gclitest/testRequire', 'gclitest/testResource', 'gclitest/testScratchpad', 'gclitest/testSettings', 'gclitest/testSpell', 'gclitest/testSplit', 'gclitest/testTokenize', 'gclitest/testTooltip', 'gclitest/testTypes', 'gclitest/testUtil'], function(require, exports, module) {
 
   
@@ -156,6 +186,16 @@ define('gclitest/suite', ['require', 'exports', 'module' , 'gcli/index', 'test/e
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('test/examiner', ['require', 'exports', 'module' , 'test/assert', 'test/status'], function(require, exports, module) {
 var examiner = exports;
 
@@ -560,6 +600,16 @@ Test.prototype.toRemote = function() {
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('test/assert', ['require', 'exports', 'module' ], function(require, exports, module) {
 
   exports.ok = ok;
@@ -573,6 +623,16 @@ define('test/assert', ['require', 'exports', 'module' ], function(require, expor
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('test/status', ['require', 'exports', 'module' ], function(require, exports, module) {
 
   
@@ -595,6 +655,16 @@ define('test/status', ['require', 'exports', 'module' ], function(require, expor
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gclitest/testCanon', ['require', 'exports', 'module' , 'gclitest/helpers', 'gcli/canon', 'test/assert'], function(require, exports, module) {
 
   var helpers = require('gclitest/helpers');
@@ -690,6 +760,16 @@ define('gclitest/testCanon', ['require', 'exports', 'module' , 'gclitest/helpers
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gclitest/helpers', ['require', 'exports', 'module' , 'test/assert'], function(require, exports, module) {
 
 
@@ -875,6 +955,16 @@ exports.exec = function(options, tests) {
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gclitest/testCli', ['require', 'exports', 'module' , 'gcli/cli', 'gcli/types', 'gclitest/mockCommands', 'test/assert'], function(require, exports, module) {
 
 
@@ -1330,6 +1420,16 @@ exports.testDeeplyNested = function() {
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gclitest/mockCommands', ['require', 'exports', 'module' , 'gcli/canon', 'gcli/util', 'gcli/types/selection', 'gcli/types/basic', 'gcli/types'], function(require, exports, module) {
 
 
@@ -1599,6 +1699,16 @@ exports.tsg = {
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gclitest/testCompletion', ['require', 'exports', 'module' , 'test/assert', 'gclitest/mockCommands'], function(require, exports, module) {
 
 
@@ -1804,6 +1914,16 @@ exports.testActivate = function(options) {
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gclitest/testExec', ['require', 'exports', 'module' , 'gcli/cli', 'gcli/canon', 'gclitest/mockCommands', 'gcli/types/node', 'test/assert'], function(require, exports, module) {
 
 
@@ -1962,6 +2082,16 @@ var mockDoc = {
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gclitest/testHelp', ['require', 'exports', 'module' , 'gclitest/helpers'], function(require, exports, module) {
 
   var helpers = require('gclitest/helpers');
@@ -2006,7 +2136,7 @@ define('gclitest/testHelp', ['require', 'exports', 'module' , 'gclitest/helpers'
         args: { search: null },
         outputMatch: [
           /Welcome to GCLI/,
-          /Source \(BSD\)/,
+          /Source \(Apache-2.0\)/,
           /Get help/
         ]
       });
@@ -2051,6 +2181,16 @@ define('gclitest/testHelp', ['require', 'exports', 'module' , 'gclitest/helpers'
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gclitest/testHistory', ['require', 'exports', 'module' , 'test/assert', 'gcli/history'], function(require, exports, module) {
 
 var test = require('test/assert');
@@ -2112,6 +2252,16 @@ exports.testForwardsPastIndex = function () {
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gclitest/testInputter', ['require', 'exports', 'module' , 'gclitest/mockCommands', 'gcli/util', 'test/assert'], function(require, exports, module) {
 
 
@@ -2202,6 +2352,16 @@ exports.testOutput = function(options) {
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gclitest/testIntro', ['require', 'exports', 'module' , 'gclitest/helpers', 'test/assert'], function(require, exports, module) {
 
   var helpers = require('gclitest/helpers');
@@ -2253,6 +2413,16 @@ define('gclitest/testIntro', ['require', 'exports', 'module' , 'gclitest/helpers
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gclitest/testJs', ['require', 'exports', 'module' , 'gcli/cli', 'gcli/types', 'gcli/types/javascript', 'gcli/canon', 'test/assert'], function(require, exports, module) {
 
 
@@ -2427,6 +2597,16 @@ exports.testBasic = function(options) {
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gclitest/testKeyboard', ['require', 'exports', 'module' , 'gcli/cli', 'gcli/canon', 'gclitest/mockCommands', 'gcli/types/javascript', 'test/assert'], function(require, exports, module) {
 
 
@@ -2608,6 +2788,16 @@ exports.testIncrDecr = function() {
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gclitest/testPref', ['require', 'exports', 'module' , 'gcli/commands/pref', 'gclitest/helpers', 'gclitest/mockSettings', 'test/assert'], function(require, exports, module) {
 
 
@@ -2813,6 +3003,16 @@ exports.testPrefExec = function(options) {
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gclitest/mockSettings', ['require', 'exports', 'module' , 'gcli/settings'], function(require, exports, module) {
 
 
@@ -2913,6 +3113,16 @@ exports.shutdown = function() {
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gclitest/testRequire', ['require', 'exports', 'module' , 'test/assert', 'gclitest/requirable'], function(require, exports, module) {
 
 var test = require('test/assert');
@@ -3005,6 +3215,16 @@ exports.testRecursive = function() {
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gclitest/requirable', ['require', 'exports', 'module' ], function(require, exports, module) {
 
   exports.thing1 = 'thing1';
@@ -3021,6 +3241,16 @@ define('gclitest/requirable', ['require', 'exports', 'module' ], function(requir
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gclitest/testResource', ['require', 'exports', 'module' , 'gcli/types/resource', 'gcli/types', 'test/assert'], function(require, exports, module) {
 
 
@@ -3105,6 +3335,16 @@ function checkPrediction(res, prediction) {
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gclitest/testScratchpad', ['require', 'exports', 'module' , 'test/assert'], function(require, exports, module) {
 
 
@@ -3158,6 +3398,16 @@ exports.testActivate = function(options) {
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gclitest/testSettings', ['require', 'exports', 'module' , 'gclitest/mockSettings', 'test/assert'], function(require, exports, module) {
 
 
@@ -3352,6 +3602,16 @@ exports.testSpellerSimple = function(options) {
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gclitest/testSplit', ['require', 'exports', 'module' , 'test/assert', 'gclitest/mockCommands', 'gcli/cli', 'gcli/canon'], function(require, exports, module) {
 
 var test = require('test/assert');
@@ -3421,6 +3681,16 @@ exports.testJavascript = function() {
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gclitest/testTokenize', ['require', 'exports', 'module' , 'test/assert', 'gcli/cli', 'gcli/argument'], function(require, exports, module) {
 
 
@@ -3706,6 +3976,16 @@ exports.testPathological = function() {
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gclitest/testTooltip', ['require', 'exports', 'module' , 'test/assert', 'gclitest/mockCommands'], function(require, exports, module) {
 
 
@@ -3801,6 +4081,16 @@ exports.testActivate = function(options) {
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gclitest/testTypes', ['require', 'exports', 'module' , 'test/assert', 'gcli/types'], function(require, exports, module) {
 
 var test = require('test/assert');
@@ -3871,6 +4161,16 @@ exports.testNullDefault = function(options) {
 
 
 
+
+
+
+
+
+
+
+
+
+
 define('gclitest/testUtil', ['require', 'exports', 'module' , 'gcli/util', 'test/assert'], function(require, exports, module) {
 
 var util = require('gcli/util');
diff --git a/browser/devtools/shared/Templater.jsm b/browser/devtools/shared/Templater.jsm
index 857052db7429..5635daf263d3 100644
--- a/browser/devtools/shared/Templater.jsm
+++ b/browser/devtools/shared/Templater.jsm
@@ -3,6 +3,18 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
 var EXPORTED_SYMBOLS = [ "Templater", "template" ];
 
 Components.utils.import("resource://gre/modules/Services.jsm");