diff --git a/README.md b/README.md
index 0e1a403..23dcc3a 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 webcomponents.js
 ================
 
-A suite of polyfills supporting the HTML web components specs:
+A suite of polyfills supporting the [Web Components](http://webcomponents.org) specs:
 
 **Custom Elements**: allows authors to define their own custom tags ([spec](https://w3c.github.io/webcomponents/spec/custom/)).
 
@@ -14,7 +14,7 @@ This also folds in polyfills for `MutationObserver` and `WeakMap`.
 
 ## Releases
 
-Pre-built (concatenated & minified) versions of the polyfills are maintained in the [tagged versions](https://github.com/Polymer/webcomponentsjs/releases) of this repo. There are two variants:
+Pre-built (concatenated & minified) versions of the polyfills are maintained in the [tagged versions](https://github.com/webcomponents/webcomponentsjs/releases) of this repo. There are two variants:
 
 `webcomponents.js` includes all of the polyfills.
 
diff --git a/bower.json b/bower.json
index 1ea8934..473f8b1 100644
--- a/bower.json
+++ b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "webcomponentsjs",
   "main": "webcomponents.js",
-  "version": "0.4.2",
+  "version": "0.5.1-1",
   "homepage": "http://webcomponents.org",
   "authors": [
     "The Polymer Authors"
diff --git a/package.json b/package.json
index a7c3a93..e8c495c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "webcomponents.js",
-  "version": "0.5.1",
+  "version": "0.5.1-1",
   "description": "webcomponents.js",
   "main": "gulpfile.js",
   "directories": {
@@ -8,7 +8,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/Polymer/webcomponentsjs.git"
+    "url": "https://github.com/webcomponents/webcomponentsjs.git"
   },
   "author": "The Polymer Authors",
   "license": {
@@ -16,7 +16,7 @@
     "url": "http://polymer.github.io/LICENSE.txt"
   },
   "bugs": {
-    "url": "https://github.com/Polymer/webcomponentsjs/issues"
+    "url": "https://github.com/webcomponents/webcomponentsjs/issues"
   },
   "homepage": "http://webcomponents.org",
   "devDependencies": {
diff --git a/src/CustomElements/CustomElements.js b/src/CustomElements/CustomElements.js
index d71629d..8ef94e6 100644
--- a/src/CustomElements/CustomElements.js
+++ b/src/CustomElements/CustomElements.js
@@ -1,4 +1,5 @@
-/*
+/**
+ * @license
  * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
  * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
  * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
diff --git a/src/CustomElements/base.js b/src/CustomElements/base.js
index a971763..e0177a5 100644
--- a/src/CustomElements/base.js
+++ b/src/CustomElements/base.js
@@ -1,4 +1,5 @@
-/*
+/**
+ * @license
  * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
  * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
  * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
@@ -32,7 +33,7 @@ scope.hasNative = Boolean(document.registerElement);
 
 // NOTE: For consistent timing, use native custom elements only when not
 // polyfilling other key related web components features.
-scope.useNative = !flags.register && scope.hasNative && 
+scope.useNative = !flags.register && scope.hasNative &&
 		!window.ShadowDOMPolyfill && (!window.HTMLImports || HTMLImports.useNative);
 
-})(CustomElements);
\ No newline at end of file
+})(CustomElements);
diff --git a/src/CustomElements/boot.js b/src/CustomElements/boot.js
index dd56d43..3eab0b6 100644
--- a/src/CustomElements/boot.js
+++ b/src/CustomElements/boot.js
@@ -1,4 +1,5 @@
-/*
+/**
+ * @license
  * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
  * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
  * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
@@ -12,6 +13,8 @@
 var useNative = scope.useNative;
 var initializeModules = scope.initializeModules;
 
+var isIE = /Trident/.test(navigator.userAgent);
+
 // If native, setup stub api and bail.
 // NOTE: we fire `WebComponentsReady` under native for api compatibility
 if (useNative) {
@@ -31,8 +34,8 @@ if (useNative) {
   };
 
 } else {
-  // Initialize polyfill modules. Note, polyfill modules are loaded but not 
-  // executed; this is a convenient way to control which modules run when 
+  // Initialize polyfill modules. Note, polyfill modules are loaded but not
+  // executed; this is a convenient way to control which modules run when
   // the polyfill is required and allows the polyfill to load even when it's
   // not needed.
   initializeModules();
@@ -65,7 +68,7 @@ function bootstrap() {
       //CustomElements.parser.parse(elt.import);
     };
   }
-  // set internal 'ready' flag, now document.registerElement will trigger 
+  // set internal 'ready' flag, now document.registerElement will trigger
   // synchronous upgrades
   CustomElements.ready = true;
   // async to ensure *native* custom elements upgrade prior to this
@@ -85,7 +88,8 @@ function bootstrap() {
 }
 
 // CustomEvent shim for IE
-if (typeof window.CustomEvent !== 'function') {
+// NOTE: we explicitly test for IE since Safari has an type `object` CustomEvent
+if (isIE && (typeof window.CustomEvent !== 'function')) {
   window.CustomEvent = function(inType, params) {
     params = params || {};
     var e = document.createEvent('CustomEvent');
@@ -105,7 +109,7 @@ if (document.readyState === 'complete' || scope.flags.eager) {
 } else if (document.readyState === 'interactive' && !window.attachEvent &&
     (!window.HTMLImports || window.HTMLImports.ready)) {
   bootstrap();
-// When loading at other readyStates, wait for the appropriate DOM event to 
+// When loading at other readyStates, wait for the appropriate DOM event to
 // bootstrap.
 } else {
   var loadEvent = window.HTMLImports && !HTMLImports.ready ?
diff --git a/src/CustomElements/observe.js b/src/CustomElements/observe.js
index 6530f7f..23c3146 100644
--- a/src/CustomElements/observe.js
+++ b/src/CustomElements/observe.js
@@ -1,4 +1,5 @@
-/*
+/**
+ * @license
  * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
  * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
  * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
@@ -101,9 +102,9 @@ function attached(element) {
 // multiple times so we protect against extra processing here.
 function _attached(element) {
   // track element for insertion if it's upgraded and cares about insertion
-  if (element.__upgraded__ && 
+  if (element.__upgraded__ &&
     (element.attachedCallback || element.detachedCallback)) {
-    // bail if the element is already marked as attached and proceed only 
+    // bail if the element is already marked as attached and proceed only
     // if it's actually in the document at this moment.
     if (!element.__attached && inDocument(element)) {
       element.__attached = true;
@@ -118,7 +119,7 @@ function _attached(element) {
   Manage nodes detached from document trees
 */
 
-// manage lifecycle on detached node and it's subtree; process detached 
+// manage lifecycle on detached node and it's subtree; process detached
 // for the node and entire subtree
 function detachedNode(node) {
   detached(node);
@@ -141,9 +142,9 @@ function detached(element) {
 // multiple times so we protect against extra processing here.
 function _detached(element) {
   // track element for removal if it's upgraded and cares about removal
-  if (element.__upgraded__ && 
+  if (element.__upgraded__ &&
     (element.attachedCallback || element.detachedCallback)) {
-    // bail if the element is already marked as not attached and proceed only 
+    // bail if the element is already marked as not attached and proceed only
     // if it's actually *not* in the document at this moment.
     if (element.__attached && !inDocument(element)) {
       element.__attached = false;
@@ -187,7 +188,7 @@ function watchShadow(node) {
 
   Here's an example:
 
-  (1) In this case, recursion is required to see `child`: 
+  (1) In this case, recursion is required to see `child`:
 
       node.innerHTML = '<div><child></child></div>'
 
@@ -233,7 +234,7 @@ function handler(mutations) {
 
 
 /*
-  When elements are added to the dom, upgrade and attached/detached may be 
+  When elements are added to the dom, upgrade and attached/detached may be
   asynchronous. `CustomElements.takeRecords` can be called to process any
   pending upgrades and attached/detached callbacks synchronously.
 */
@@ -280,7 +281,7 @@ function upgradeDocument(doc) {
 
 /*
 This method is intended to be called when the document tree (including imports)
-has pending custom elements to upgrade. It can be called multiple times and 
+has pending custom elements to upgrade. It can be called multiple times and
 should do nothing if no elements are in need of upgrade.
 */
 function upgradeDocumentTree(doc) {
diff --git a/src/CustomElements/register.js b/src/CustomElements/register.js
index 246de07..45d9fc2 100644
--- a/src/CustomElements/register.js
+++ b/src/CustomElements/register.js
@@ -1,4 +1,5 @@
-/*
+/**
+ * @license
  * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
  * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
  * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
diff --git a/src/CustomElements/traverse.js b/src/CustomElements/traverse.js
index 8dbada5..e8e8a43 100644
--- a/src/CustomElements/traverse.js
+++ b/src/CustomElements/traverse.js
@@ -1,4 +1,5 @@
-/*
+/**
+ * @license
  * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
  * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
  * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
diff --git a/src/CustomElements/upgrade.js b/src/CustomElements/upgrade.js
index 2ce0b75..47e18bd 100644
--- a/src/CustomElements/upgrade.js
+++ b/src/CustomElements/upgrade.js
@@ -1,4 +1,5 @@
-/*
+/**
+ * @license
  * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
  * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
  * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
@@ -66,7 +67,7 @@ function upgradeWithDefinition(element, definition) {
   return element;
 }
 
-//  Set __proto__ on supported platforms and use a mixin strategy when 
+//  Set __proto__ on supported platforms and use a mixin strategy when
 //  this is not supported; e.g. on IE10.
 function implementPrototype(element, definition) {
   // prototype swizzling is best
diff --git a/src/HTMLImports/HTMLImports.js b/src/HTMLImports/HTMLImports.js
index 317cae4..2b76f5d 100644
--- a/src/HTMLImports/HTMLImports.js
+++ b/src/HTMLImports/HTMLImports.js
@@ -1,4 +1,5 @@
-/*
+/**
+ * @license
  * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
  * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
  * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
diff --git a/src/HTMLImports/Loader.js b/src/HTMLImports/Loader.js
index e5c2a1c..b413d30 100644
--- a/src/HTMLImports/Loader.js
+++ b/src/HTMLImports/Loader.js
@@ -1,4 +1,5 @@
-/*
+/**
+ * @license
  * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
  * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
  * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
@@ -14,8 +15,8 @@ var flags = scope.flags;
 
 // This loader supports a dynamic list of urls
 // and an oncomplete callback that is called when the loader is done.
-// NOTE: The polyfill currently does *not* need this dynamism or the 
-// onComplete concept. Because of this, the loader could be simplified 
+// NOTE: The polyfill currently does *not* need this dynamism or the
+// onComplete concept. Because of this, the loader could be simplified
 // quite a bit.
 var Loader = function(onLoad, onComplete) {
   this.cache = {};
@@ -132,4 +133,4 @@ Loader.prototype = {
 // exports
 scope.Loader = Loader;
 
-});
\ No newline at end of file
+});
diff --git a/src/HTMLImports/Observer.js b/src/HTMLImports/Observer.js
index 128cdde..4b75091 100644
--- a/src/HTMLImports/Observer.js
+++ b/src/HTMLImports/Observer.js
@@ -1,4 +1,5 @@
-/*
+/**
+ * @license
  * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
  * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
  * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
diff --git a/src/HTMLImports/base.js b/src/HTMLImports/base.js
index f181bbc..f4c9fbe 100644
--- a/src/HTMLImports/base.js
+++ b/src/HTMLImports/base.js
@@ -1,4 +1,5 @@
-/*
+/**
+ * @license
  * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
  * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
  * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
@@ -45,9 +46,9 @@ var currentScriptDescriptor = {
   get: function() {
     var script = HTMLImports.currentScript || document.currentScript ||
         // NOTE: only works when called in synchronously executing code.
-        // readyState should check if `loading` but IE10 is 
+        // readyState should check if `loading` but IE10 is
         // interactive when scripts run so we cheat.
-        (document.readyState !== 'complete' ? 
+        (document.readyState !== 'complete' ?
         document.scripts[document.scripts.length - 1] : null);
     return wrap(script);
   },
@@ -64,16 +65,16 @@ Object.defineProperty(rootDocument, '_currentScript', currentScriptDescriptor);
   code in either an `HTMLImportsLoaded` hander or after load time in an
   `HTMLImports.whenReady(callback)` call.
 
-  NOTE: This module also supports these apis under the native implementation. 
-  Therefore, if this file is loaded, the same code can be used under both 
+  NOTE: This module also supports these apis under the native implementation.
+  Therefore, if this file is loaded, the same code can be used under both
   the polyfill and native implementation.
  */
 
 var isIE = /Trident|Edge/.test(navigator.userAgent);
 
-// call a callback when all HTMLImports in the document at call time 
+// call a callback when all HTMLImports in the document at call time
 // (or at least document ready) have loaded.
-// 1. ensure the document is in a ready state (has dom), then 
+// 1. ensure the document is in a ready state (has dom), then
 // 2. watch for loading of imports and call callback when done
 function whenReady(callback, doc) {
   doc = doc || rootDocument;
@@ -95,7 +96,7 @@ function isDocumentReady(doc) {
 function whenDocumentReady(callback, doc) {
   if (!isDocumentReady(doc)) {
     var checkReady = function() {
-      if (doc.readyState === 'complete' || 
+      if (doc.readyState === 'complete' ||
           doc.readyState === requiredReadyState) {
         doc.removeEventListener(READY_EVENT, checkReady);
         whenDocumentReady(callback, doc);
@@ -115,7 +116,7 @@ function markTargetLoaded(event) {
 function watchImportsLoad(callback, doc) {
   var imports = doc.querySelectorAll('link[rel=import]');
   var loaded = 0, l = imports.length;
-  function checkDone(d) { 
+  function checkDone(d) {
     if ((loaded == l) && callback) {
        callback();
     }
@@ -143,15 +144,15 @@ function watchImportsLoad(callback, doc) {
 // all imports (see below).
 // However, we cannot rely on this entirely without watching the entire document
 // for import links. For perf reasons, currently only head is watched.
-// Instead, we fallback to checking if the import property is available 
-// and the document is not itself loading. 
+// Instead, we fallback to checking if the import property is available
+// and the document is not itself loading.
 function isImportLoaded(link) {
-  return useNative ? link.__loaded || 
+  return useNative ? link.__loaded ||
       (link.import && link.import.readyState !== 'loading') :
       link.__importParsed;
 }
 
-// TODO(sorvell): Workaround for 
+// TODO(sorvell): Workaround for
 // https://www.w3.org/Bugs/Public/show_bug.cgi?id=25007, should be removed when
 // this bug is addressed.
 // (1) Install a mutation observer to see when HTMLImports have loaded
@@ -159,7 +160,7 @@ function isImportLoaded(link) {
 // imports for loading.
 //
 // NOTE: The workaround has restricted functionality: (1) it's only compatible
-// with imports that are added to document.head since the mutation observer 
+// with imports that are added to document.head since the mutation observer
 // watches only head for perf reasons, (2) it requires this script
 // to run before any imports have completed loading.
 if (useNative) {
@@ -174,7 +175,7 @@ if (useNative) {
   function handleImports(nodes) {
     for (var i=0, l=nodes.length, n; (i<l) && (n=nodes[i]); i++) {
       if (isImport(n)) {
-        handleImport(n);  
+        handleImport(n);
       }
     }
   }
@@ -206,8 +207,8 @@ if (useNative) {
 
 }
 
-// Fire the 'HTMLImportsLoaded' event when imports in document at load time 
-// have loaded. This event is required to simulate the script blocking 
+// Fire the 'HTMLImportsLoaded' event when imports in document at load time
+// have loaded. This event is required to simulate the script blocking
 // behavior of native imports. A main document script that needs to be sure
 // imports have loaded should wait for this event.
 whenReady(function() {
diff --git a/src/HTMLImports/boot.js b/src/HTMLImports/boot.js
index 090d8e3..206a99f 100644
--- a/src/HTMLImports/boot.js
+++ b/src/HTMLImports/boot.js
@@ -1,4 +1,5 @@
-/*
+/**
+ * @license
  * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
  * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
  * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
@@ -9,7 +10,8 @@
 (function(scope){
 
 // imports
-initializeModules = scope.initializeModules;
+var initializeModules = scope.initializeModules;
+var isIE = scope.isIE;
 
 /*
 NOTE: Even when native HTMLImports exists, the following api is available by
@@ -24,20 +26,20 @@ if (scope.useNative) {
   return;
 }
 
-// IE shim for CustomEvent
-if (typeof window.CustomEvent !== 'function') {
-  window.CustomEvent = function(inType, dictionary) {
-    var e = document.createEvent('HTMLEvents');
-    e.initEvent(inType,
-      dictionary.bubbles === false ? false : true,
-      dictionary.cancelable === false ? false : true,
-      dictionary.detail);
+// CustomEvent shim for IE
+// NOTE: we explicitly test for IE since Safari has an type `object` CustomEvent
+if (isIE && (typeof window.CustomEvent !== 'function')) {
+  window.CustomEvent = function(inType, params) {
+    params = params || {};
+    var e = document.createEvent('CustomEvent');
+    e.initCustomEvent(inType, Boolean(params.bubbles), Boolean(params.cancelable), params.detail);
     return e;
   };
+  window.CustomEvent.prototype = window.Event.prototype;
 }
 
-// Initialize polyfill modules. Note, polyfill modules are loaded but not 
-// executed; this is a convenient way to control which modules run when 
+// Initialize polyfill modules. Note, polyfill modules are loaded but not
+// executed; this is a convenient way to control which modules run when
 // the polyfill is required and allows the polyfill to load even when it's
 // not needed.
 initializeModules();
@@ -51,9 +53,9 @@ var rootDocument = scope.rootDocument;
 function bootstrap() {
   HTMLImports.importer.bootDocument(rootDocument);
 }
-  
+
 // TODO(sorvell): SD polyfill does *not* generate mutations for nodes added
-// by the parser. For this reason, we must wait until the dom exists to 
+// by the parser. For this reason, we must wait until the dom exists to
 // bootstrap.
 if (document.readyState === 'complete' ||
     (document.readyState === 'interactive' && !window.attachEvent)) {
diff --git a/src/HTMLImports/dynamic.js b/src/HTMLImports/dynamic.js
index 64d1a0e..a0a0d5f 100644
--- a/src/HTMLImports/dynamic.js
+++ b/src/HTMLImports/dynamic.js
@@ -1,4 +1,5 @@
-/*
+/**
+ * @license
  * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
  * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
  * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
@@ -46,17 +47,17 @@ var dynamic = {
 
   shouldParseNode: function(node) {
     return (node.nodeType === 1) && matches.call(node,
-        parser.parseSelectorsForNode(node));  
+        parser.parseSelectorsForNode(node));
   }
-  
+
 };
 
 // let the dynamic element helper tie into the import observer.
 importer.observer.addCallback = dynamic.added.bind(dynamic);
 
 // x-plat matches
-var matches = HTMLElement.prototype.matches || 
-    HTMLElement.prototype.matchesSelector || 
+var matches = HTMLElement.prototype.matches ||
+    HTMLElement.prototype.matchesSelector ||
     HTMLElement.prototype.webkitMatchesSelector ||
     HTMLElement.prototype.mozMatchesSelector ||
     HTMLElement.prototype.msMatchesSelector;
diff --git a/src/HTMLImports/importer.js b/src/HTMLImports/importer.js
index e3c1f29..c4f8025 100644
--- a/src/HTMLImports/importer.js
+++ b/src/HTMLImports/importer.js
@@ -1,4 +1,5 @@
-/*
+/**
+ * @license
  * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
  * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
  * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
@@ -22,43 +23,43 @@ var parser = scope.parser;
 // for any document, importer:
 // - loads any linked import documents (with deduping)
 // - whenever an import is loaded, prompts the parser to try to parse
-// - observes imported documents for new elements (these are handled via the 
+// - observes imported documents for new elements (these are handled via the
 // dynamic importer)
 var importer = {
 
   documents: {},
-  
+
   // nodes to load in the mian document
   documentPreloadSelectors: IMPORT_SELECTOR,
-  
+
   // nodes to load in imports
   importsPreloadSelectors: [
     IMPORT_SELECTOR
   ].join(','),
-  
+
   loadNode: function(node) {
     importLoader.addNode(node);
   },
-  
+
   // load all loadable elements within the parent element
   loadSubtree: function(parent) {
     var nodes = this.marshalNodes(parent);
     // add these nodes to loader's queue
     importLoader.addNodes(nodes);
   },
-  
+
   marshalNodes: function(parent) {
     // all preloadable nodes in inDocument
     return parent.querySelectorAll(this.loadSelectorsForNode(parent));
   },
-  
+
   // find the proper set of load selectors for a given node
   loadSelectorsForNode: function(node) {
     var doc = node.ownerDocument || node;
     return doc === rootDocument ? this.documentPreloadSelectors :
         this.importsPreloadSelectors;
   },
-  
+
   loaded: function(url, elt, resource, err, redirectedUrl) {
     flags.load && console.log('loaded', url, elt);
     // store generic resource
@@ -87,7 +88,7 @@ var importer = {
     }
     parser.parseNext();
   },
-  
+
   bootDocument: function(doc) {
     this.loadSubtree(doc);
     // observe documents for new elements being added
@@ -102,11 +103,11 @@ var importer = {
 };
 
 // loader singleton to handle loading imports
-var importLoader = new Loader(importer.loaded.bind(importer), 
+var importLoader = new Loader(importer.loaded.bind(importer),
     importer.loadedAll.bind(importer));
 
 // observer singleton to handle observing elements in imports
-// NOTE: the observer has a node added callback and this is set 
+// NOTE: the observer has a node added callback and this is set
 // by the dynamic importer module.
 importer.observer = new Observer();
 
@@ -128,7 +129,8 @@ function makeDocument(resource, url) {
   base.setAttribute('href', url);
   // add baseURI support to browsers (IE) that lack it.
   if (!doc.baseURI) {
-    doc.baseURI = url;
+    // Use defineProperty since Safari throws an exception when using assignment.
+    Object.defineProperty(doc, 'baseURI', {value:url});
   }
   // ensure UTF-8 charset
   var meta = doc.createElement('meta');
@@ -164,4 +166,4 @@ if (!document.baseURI) {
 scope.importer = importer;
 scope.importLoader = importLoader;
 
-});
\ No newline at end of file
+});
diff --git a/src/HTMLImports/module.js b/src/HTMLImports/module.js
index 8f94380..5f47d1a 100644
--- a/src/HTMLImports/module.js
+++ b/src/HTMLImports/module.js
@@ -1,4 +1,5 @@
-/*
+/**
+ * @license
  * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
  * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
  * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
diff --git a/src/HTMLImports/parser.js b/src/HTMLImports/parser.js
index 034901c..15dfee4 100644
--- a/src/HTMLImports/parser.js
+++ b/src/HTMLImports/parser.js
@@ -1,4 +1,5 @@
-/*
+/**
+ * @license
  * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
  * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
  * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
@@ -21,7 +22,7 @@ var IMPORT_SELECTOR = 'link[rel=' + IMPORT_LINK_TYPE + ']';
 // parses import related elements and ensures proper parse order
 // parse order is enforced by crawling the tree and monitoring which elements
 // have been parsed;
-// elements can be dynamically added to imports. These are maintained in a 
+// elements can be dynamically added to imports. These are maintained in a
 // separate queue and parsed after all other elements.
 var importParser = {
 
@@ -79,7 +80,7 @@ var importParser = {
   // To prompt the system to parse the next element, parseNext should then be
   // called.
   // Note, parseNext used to be included at the end of markParsingComplete, but
-  // we must not do this so that, for example, we can (1) mark parsing complete 
+  // we must not do this so that, for example, we can (1) mark parsing complete
   // then (2) fire an import load event, and then (3) parse the next resource.
   markParsing: function(elt) {
     flags.parse && console.log('parsing', elt);
@@ -117,7 +118,7 @@ var importParser = {
     this.markParsingComplete(elt);
     // fire load event
     if (elt.__resource && !elt.__error) {
-      elt.dispatchEvent(new CustomEvent('load', {bubbles: false}));    
+      elt.dispatchEvent(new CustomEvent('load', {bubbles: false}));
     } else {
       elt.dispatchEvent(new CustomEvent('error', {bubbles: false}));
     }
@@ -168,12 +169,7 @@ var importParser = {
 
   addElementToDocument: function(elt) {
     var port = this.rootImportForElement(elt.__importElement || elt);
-    var l = port.__insertedElements = port.__insertedElements || 0;
-    var refNode = port.nextElementSibling;
-    for (var i=0; i < l; i++) {
-      refNode = refNode && refNode.nextElementSibling;
-    }
-    port.parentNode.insertBefore(elt, refNode);
+    port.parentNode.insertBefore(elt, port);
   },
 
   // tracks when a loadable element has loaded
@@ -223,13 +219,13 @@ var importParser = {
   parseScript: function(scriptElt) {
     var script = document.createElement('script');
     script.__importElement = scriptElt;
-    script.src = scriptElt.src ? scriptElt.src : 
+    script.src = scriptElt.src ? scriptElt.src :
         generateScriptDataUrl(scriptElt);
     // keep track of executing script to help polyfill `document.currentScript`
     scope.currentScript = scriptElt;
     this.trackElement(script, function(e) {
       script.parentNode.removeChild(script);
-      scope.currentScript = null;  
+      scope.currentScript = null;
     });
     this.addElementToDocument(script);
   },
@@ -240,7 +236,7 @@ var importParser = {
   // order.
   nextToParse: function() {
     this._mayParse = [];
-    return !this.parsingElement && (this.nextToParseInDoc(rootDocument) || 
+    return !this.parsingElement && (this.nextToParseInDoc(rootDocument) ||
         this.nextToParseDynamic());
   },
 
diff --git a/src/HTMLImports/path.js b/src/HTMLImports/path.js
index 93d1d6d..4dd0d33 100644
--- a/src/HTMLImports/path.js
+++ b/src/HTMLImports/path.js
@@ -1,4 +1,5 @@
-/*
+/**
+ * @license
  * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
  * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
  * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
@@ -11,7 +12,7 @@ HTMLImports.addModule(function(scope) {
 var CSS_URL_REGEXP = /(url\()([^)]*)(\))/g;
 var CSS_IMPORT_REGEXP = /(@import[\s]+(?!url\())([^;]*)(;)/g;
 
-// path fixup: style elements in imports must be made relative to the main 
+// path fixup: style elements in imports must be made relative to the main
 // document. We fixup url's in url() and @import.
 var path = {
 
@@ -19,7 +20,7 @@ var path = {
     var doc = style.ownerDocument;
     var resolver = doc.createElement('a');
     style.textContent = this.resolveUrlsInCssText(style.textContent, resolver);
-    return style;  
+    return style;
   },
 
   resolveUrlsInCssText: function(cssText, urlObj) {
@@ -34,7 +35,7 @@ var path = {
       urlObj.href = urlPath;
       urlPath = urlObj.href;
       return pre + '\'' + urlPath + '\'' + post;
-    });    
+    });
   }
 
 };
diff --git a/src/HTMLImports/xhr.js b/src/HTMLImports/xhr.js
index f66bb8b..5e1346d 100644
--- a/src/HTMLImports/xhr.js
+++ b/src/HTMLImports/xhr.js
@@ -1,4 +1,5 @@
-/*
+/**
+ * @license
  * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
  * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
  * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
@@ -48,7 +49,7 @@ xhr = {
   loadDocument: function(url, next, nextContext) {
     this.load(url, next, nextContext).responseType = 'document';
   }
-  
+
 };
 
 // exports
diff --git a/src/MutationObserver/MutationObserver.js b/src/MutationObserver/MutationObserver.js
index f3c6dfc..f3b5695 100644
--- a/src/MutationObserver/MutationObserver.js
+++ b/src/MutationObserver/MutationObserver.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2012 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 (function(global) {
diff --git a/src/ShadowCSS/ShadowCSS.js b/src/ShadowCSS/ShadowCSS.js
index 58b10cf..9e4b18f 100644
--- a/src/ShadowCSS/ShadowCSS.js
+++ b/src/ShadowCSS/ShadowCSS.js
@@ -1,4 +1,5 @@
-/*
+/**
+ * @license
  * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
  * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
  * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
@@ -10,10 +11,10 @@
 /*
   This is a limited shim for ShadowDOM css styling.
   https://dvcs.w3.org/hg/webcomponents/raw-file/tip/spec/shadow/index.html#styles
-  
-  The intention here is to support only the styling features which can be 
-  relatively simply implemented. The goal is to allow users to avoid the 
-  most obvious pitfalls and do so without compromising performance significantly. 
+
+  The intention here is to support only the styling features which can be
+  relatively simply implemented. The goal is to allow users to avoid the
+  most obvious pitfalls and do so without compromising performance significantly.
   For ShadowDOM styling that's not covered here, a set of best practices
   can be provided that should allow users to accomplish more complex styling.
 
@@ -23,56 +24,56 @@
   Shimmed features:
 
   * :host, :host-context: ShadowDOM allows styling of the shadowRoot's host
-  element using the :host rule. To shim this feature, the :host styles are 
-  reformatted and prefixed with a given scope name and promoted to a 
+  element using the :host rule. To shim this feature, the :host styles are
+  reformatted and prefixed with a given scope name and promoted to a
   document level stylesheet.
   For example, given a scope name of .foo, a rule like this:
-  
+
     :host {
         background: red;
       }
     }
-  
+
   becomes:
-  
+
     .foo {
       background: red;
     }
-  
-  * encapsultion: Styles defined within ShadowDOM, apply only to 
+
+  * encapsultion: Styles defined within ShadowDOM, apply only to
   dom inside the ShadowDOM. Polymer uses one of two techniques to imlement
   this feature.
-  
-  By default, rules are prefixed with the host element tag name 
+
+  By default, rules are prefixed with the host element tag name
   as a descendant selector. This ensures styling does not leak out of the 'top'
   of the element's ShadowDOM. For example,
 
   div {
       font-weight: bold;
     }
-  
+
   becomes:
 
   x-foo div {
       font-weight: bold;
     }
-  
+
   becomes:
 
 
-  Alternatively, if WebComponents.ShadowCSS.strictStyling is set to true then 
+  Alternatively, if WebComponents.ShadowCSS.strictStyling is set to true then
   selectors are scoped by adding an attribute selector suffix to each
-  simple selector that contains the host element tag name. Each element 
-  in the element's ShadowDOM template is also given the scope attribute. 
+  simple selector that contains the host element tag name. Each element
+  in the element's ShadowDOM template is also given the scope attribute.
   Thus, these rules match only elements that have the scope attribute.
   For example, given a scope name of x-foo, a rule like this:
-  
+
     div {
       font-weight: bold;
     }
-  
+
   becomes:
-  
+
     div[x-foo] {
       font-weight: bold;
     }
@@ -84,31 +85,31 @@
   shadowRoot should not cross the ShadowDOM boundary and should not apply
   inside a shadowRoot.
 
-  This styling behavior is not emulated. Some possible ways to do this that 
+  This styling behavior is not emulated. Some possible ways to do this that
   were rejected due to complexity and/or performance concerns include: (1) reset
   every possible property for every possible selector for a given scope name;
   (2) re-implement css in javascript.
-  
+
   As an alternative, users should make sure to use selectors
   specific to the scope in which they are working.
-  
+
   * ::distributed: This behavior is not emulated. It's often not necessary
   to style the contents of a specific insertion point and instead, descendants
-  of the host element can be styled selectively. Users can also create an 
+  of the host element can be styled selectively. Users can also create an
   extra node around an insertion point and style that node's contents
   via descendent selectors. For example, with a shadowRoot like this:
-  
+
     <style>
       ::content(div) {
         background: red;
       }
     </style>
     <content></content>
-  
+
   could become:
-  
+
     <style>
-      / *@polyfill .content-container div * / 
+      / *@polyfill .content-container div * /
       ::content(div) {
         background: red;
       }
@@ -116,9 +117,9 @@
     <div class="content-container">
       <content></content>
     </div>
-  
+
   Note the use of @polyfill in the comment above a ShadowDOM specific style
-  declaration. This is a directive to the styling shim to use the selector 
+  declaration. This is a directive to the styling shim to use the selector
   in comments in lieu of the next selector when running under polyfill.
 */
 (function(scope) {
@@ -232,14 +233,14 @@ var ShadowCSS = {
   /*
    * Process styles to convert native ShadowDOM rules that will trip
    * up the css parser; we rely on decorating the stylesheet with inert rules.
-   * 
+   *
    * For example, we convert this rule:
-   * 
+   *
    * polyfill-next-selector { content: ':host menu-item'; }
    * ::content menu-item {
-   * 
+   *
    * to this:
-   * 
+   *
    * scopeName menu-item {
    *
   **/
@@ -255,16 +256,16 @@ var ShadowCSS = {
   },
   /*
    * Process styles to add rules which will only apply under the polyfill
-   * 
+   *
    * For example, we convert this rule:
-   * 
+   *
    * polyfill-rule {
    *   content: ':host menu-item';
    * ...
    * }
-   * 
+   *
    * to this:
-   * 
+   *
    * scopeName menu-item {...}
    *
   **/
@@ -280,11 +281,11 @@ var ShadowCSS = {
     });
   },
   /* Ensure styles are scoped. Pseudo-scoping takes a rule like:
-   * 
-   *  .foo {... } 
-   *  
+   *
+   *  .foo {... }
+   *
    *  and converts this to
-   *  
+   *
    *  scopeName .foo { ... }
   */
   scopeCssText: function(cssText, scopeSelector) {
@@ -305,15 +306,15 @@ var ShadowCSS = {
   },
   /*
    * Process styles to add rules which will only apply under the polyfill
-   * and do not process via CSSOM. (CSSOM is destructive to rules on rare 
+   * and do not process via CSSOM. (CSSOM is destructive to rules on rare
    * occasions, e.g. -webkit-calc on Safari.)
    * For example, we convert this rule:
-   * 
-   * (comment start) @polyfill-unscoped-rule menu-item { 
+   *
+   * (comment start) @polyfill-unscoped-rule menu-item {
    * ... } (comment end)
-   * 
+   *
    * to this:
-   * 
+   *
    * menu-item {...}
    *
   **/
@@ -345,13 +346,13 @@ var ShadowCSS = {
    * to
    *
    * scopeName.foo > .bar, .foo scopeName > .bar { }
-   * 
+   *
    * and
    *
    * :host-context(.foo:host) .bar { ... }
-   * 
+   *
    * to
-   * 
+   *
    * scopeName.foo .bar { ... }
   */
   convertColonHostContext: function(cssText) {
@@ -400,7 +401,7 @@ var ShadowCSS = {
     if (cssRules) {
       Array.prototype.forEach.call(cssRules, function(rule) {
         if (rule.selectorText && (rule.style && rule.style.cssText !== undefined)) {
-          cssText += this.scopeSelector(rule.selectorText, scopeSelector, 
+          cssText += this.scopeSelector(rule.selectorText, scopeSelector,
             this.strictStyling) + ' {\n\t';
           cssText += this.propertiesFromRule(rule) + '\n}\n\n';
         } else if (rule.type === CSSRule.MEDIA_RULE) {
@@ -440,7 +441,7 @@ var ShadowCSS = {
     parts.forEach(function(p) {
       p = p.trim();
       if (this.selectorNeedsScoping(p, scopeSelector)) {
-        p = (strict && !p.match(polyfillHostNoCombinator)) ? 
+        p = (strict && !p.match(polyfillHostNoCombinator)) ?
             this.applyStrictSelectorScope(p, scopeSelector) :
             this.applySelectorScope(p, scopeSelector);
       }
@@ -511,7 +512,7 @@ var ShadowCSS = {
     // property. (https://bugs.webkit.org/show_bug.cgi?id=118045)
     // don't replace attr rules
     if (rule.style.content && !rule.style.content.match(/['"]+|attr/)) {
-      cssText = cssText.replace(/content:[^;]*;/g, 'content: \'' + 
+      cssText = cssText.replace(/content:[^;]*;/g, 'content: \'' +
           rule.style.content + '\';');
     }
     // TODO(sorvell): we can workaround this issue here, but we need a list
@@ -551,7 +552,7 @@ var selectorRe = /([^{]*)({[\s\S]*?})/gim,
     cssCommentRe = /\/\*[^*]*\*+([^/*][^*]*\*+)*\//gim,
     // TODO(sorvell): remove either content or comment
     cssCommentNextSelectorRe = /\/\*\s*@polyfill ([^*]*\*+([^/*][^*]*\*+)*\/)([^{]*?){/gim,
-    cssContentNextSelectorRe = /polyfill-next-selector[^}]*content\:[\s]*?['"](.*?)['"][;\s]*}([^{]*?){/gim,  
+    cssContentNextSelectorRe = /polyfill-next-selector[^}]*content\:[\s]*?['"](.*?)['"][;\s]*}([^{]*?){/gim,
     // TODO(sorvell): remove either content or comment
     cssCommentRuleRe = /\/\*\s@polyfill-rule([^*]*\*+([^/*][^*]*\*+)*)\//gim,
     cssContentRuleRe = /(polyfill-rule)[^}]*(content\:[\s]*['"](.*?)['"])[;\s]*[^}]*}/gim,
@@ -711,7 +712,7 @@ if (window.ShadowDOMPolyfill) {
   // consider a better solution.
   document.addEventListener('DOMContentLoaded', function() {
     var urlResolver = scope.urlResolver;
-    
+
     if (window.HTMLImports && !HTMLImports.useNative) {
       var SHIM_SHEET_SELECTOR = 'link[rel=stylesheet]' +
           '[' + SHIM_ATTRIBUTE + ']';
@@ -724,7 +725,7 @@ if (window.ShadowDOMPolyfill) {
         SHIM_SHEET_SELECTOR,
         SHIM_STYLE_SELECTOR
       ].join(',');
-  
+
       var originalParseGeneric = HTMLImports.parser.parseGeneric;
 
       HTMLImports.parser.parseGeneric = function(elt) {
diff --git a/src/ShadowDOM/ArraySplice.js b/src/ShadowDOM/ArraySplice.js
index d559973..f87800a 100644
--- a/src/ShadowDOM/ArraySplice.js
+++ b/src/ShadowDOM/ArraySplice.js
@@ -1,6 +1,13 @@
-// Copyright 2013 The Polymer Authors. All rights reserved.
-// Use of this source code is goverened by a BSD-style
-// license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+ */
+
 (function(scope) {
   'use strict';
 
@@ -252,4 +259,4 @@
   // exports
   scope.ArraySplice = ArraySplice;
 
-})(window.ShadowDOMPolyfill);
\ No newline at end of file
+})(window.ShadowDOMPolyfill);
diff --git a/src/ShadowDOM/MutationObserver.js b/src/ShadowDOM/MutationObserver.js
index 8824a94..ff6c56d 100644
--- a/src/ShadowDOM/MutationObserver.js
+++ b/src/ShadowDOM/MutationObserver.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 (function(scope) {
diff --git a/src/ShadowDOM/ShadowDOM.js b/src/ShadowDOM/ShadowDOM.js
index 4f11515..66e7458 100644
--- a/src/ShadowDOM/ShadowDOM.js
+++ b/src/ShadowDOM/ShadowDOM.js
@@ -1,6 +1,12 @@
-// Copyright 2013 The Polymer Authors. All rights reserved.
-// Use of this source code is goverened by a BSD-style
-// license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+ */
 
 (function() {
 
diff --git a/src/ShadowDOM/ShadowRenderer.js b/src/ShadowDOM/ShadowRenderer.js
index 0fc088c..cd3d22e 100644
--- a/src/ShadowDOM/ShadowRenderer.js
+++ b/src/ShadowDOM/ShadowRenderer.js
@@ -1,6 +1,12 @@
-// Copyright 2013 The Polymer Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+ */
 
 (function(scope) {
   'use strict';
diff --git a/src/ShadowDOM/TreeScope.js b/src/ShadowDOM/TreeScope.js
index 5bdada9..07011a7 100644
--- a/src/ShadowDOM/TreeScope.js
+++ b/src/ShadowDOM/TreeScope.js
@@ -1,7 +1,11 @@
 /**
- * Copyright 2014 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 (function(scope) {
diff --git a/src/ShadowDOM/microtask.js b/src/ShadowDOM/microtask.js
index 11ad4de..31e7246 100644
--- a/src/ShadowDOM/microtask.js
+++ b/src/ShadowDOM/microtask.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 (function(context) {
diff --git a/src/ShadowDOM/querySelector.js b/src/ShadowDOM/querySelector.js
index 2901f98..be4c449 100644
--- a/src/ShadowDOM/querySelector.js
+++ b/src/ShadowDOM/querySelector.js
@@ -1,6 +1,12 @@
-// Copyright 2013 The Polymer Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+ */
 
 (function(scope) {
   'use strict';
diff --git a/src/ShadowDOM/wrappers.js b/src/ShadowDOM/wrappers.js
index 41fba6c..cf2d317 100644
--- a/src/ShadowDOM/wrappers.js
+++ b/src/ShadowDOM/wrappers.js
@@ -1,6 +1,12 @@
-// Copyright 2012 The Polymer Authors. All rights reserved.
-// Use of this source code is goverened by a BSD-style
-// license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+ */
 
 window.ShadowDOMPolyfill = {};
 
diff --git a/src/ShadowDOM/wrappers/CanvasRenderingContext2D.js b/src/ShadowDOM/wrappers/CanvasRenderingContext2D.js
index dcbfef6..44ac212 100644
--- a/src/ShadowDOM/wrappers/CanvasRenderingContext2D.js
+++ b/src/ShadowDOM/wrappers/CanvasRenderingContext2D.js
@@ -1,6 +1,12 @@
-// Copyright 2013 The Polymer Authors. All rights reserved.
-// Use of this source code is goverened by a BSD-style
-// license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+ */
 
 (function(scope) {
   'use strict';
diff --git a/src/ShadowDOM/wrappers/CharacterData.js b/src/ShadowDOM/wrappers/CharacterData.js
index 061da86..425f791 100644
--- a/src/ShadowDOM/wrappers/CharacterData.js
+++ b/src/ShadowDOM/wrappers/CharacterData.js
@@ -1,6 +1,12 @@
-// Copyright 2013 The Polymer Authors. All rights reserved.
-// Use of this source code is goverened by a BSD-style
-// license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+ */
 
 (function(scope) {
   'use strict';
diff --git a/src/ShadowDOM/wrappers/DOMTokenList.js b/src/ShadowDOM/wrappers/DOMTokenList.js
index 63ba681..daea388 100644
--- a/src/ShadowDOM/wrappers/DOMTokenList.js
+++ b/src/ShadowDOM/wrappers/DOMTokenList.js
@@ -1,6 +1,12 @@
-// Copyright 2014 The Polymer Authors. All rights reserved.
-// Use of this source code is goverened by a BSD-style
-// license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+ */
 
 (function(scope) {
   'use strict';
diff --git a/src/ShadowDOM/wrappers/DataTransfer.js b/src/ShadowDOM/wrappers/DataTransfer.js
index ce60e67..528c14a 100644
--- a/src/ShadowDOM/wrappers/DataTransfer.js
+++ b/src/ShadowDOM/wrappers/DataTransfer.js
@@ -1,7 +1,11 @@
 /**
- * Copyright 2014 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 (function(scope) {
diff --git a/src/ShadowDOM/wrappers/Document.js b/src/ShadowDOM/wrappers/Document.js
index 6f0b5d6..82c4859 100644
--- a/src/ShadowDOM/wrappers/Document.js
+++ b/src/ShadowDOM/wrappers/Document.js
@@ -1,6 +1,12 @@
-// Copyright 2013 The Polymer Authors. All rights reserved.
-// Use of this source code is goverened by a BSD-style
-// license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+ */
 
 (function(scope) {
   'use strict';
diff --git a/src/ShadowDOM/wrappers/Element.js b/src/ShadowDOM/wrappers/Element.js
index 4a199b4..86ebca6 100644
--- a/src/ShadowDOM/wrappers/Element.js
+++ b/src/ShadowDOM/wrappers/Element.js
@@ -1,6 +1,12 @@
-// Copyright 2013 The Polymer Authors. All rights reserved.
-// Use of this source code is goverened by a BSD-style
-// license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+ */
 
 (function(scope) {
   'use strict';
diff --git a/src/ShadowDOM/wrappers/FormData.js b/src/ShadowDOM/wrappers/FormData.js
index 3082a20..57cb27b 100644
--- a/src/ShadowDOM/wrappers/FormData.js
+++ b/src/ShadowDOM/wrappers/FormData.js
@@ -1,7 +1,11 @@
 /**
- * Copyright 2014 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 (function(scope) {
diff --git a/src/ShadowDOM/wrappers/HTMLAudioElement.js b/src/ShadowDOM/wrappers/HTMLAudioElement.js
index f87b196..71e668a 100644
--- a/src/ShadowDOM/wrappers/HTMLAudioElement.js
+++ b/src/ShadowDOM/wrappers/HTMLAudioElement.js
@@ -1,6 +1,12 @@
-// Copyright 2013 The Polymer Authors. All rights reserved.
-// Use of this source code is goverened by a BSD-style
-// license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+ */
 
 (function(scope) {
   'use strict';
diff --git a/src/ShadowDOM/wrappers/HTMLCanvasElement.js b/src/ShadowDOM/wrappers/HTMLCanvasElement.js
index 7162bf1..71b962d 100644
--- a/src/ShadowDOM/wrappers/HTMLCanvasElement.js
+++ b/src/ShadowDOM/wrappers/HTMLCanvasElement.js
@@ -1,6 +1,12 @@
-// Copyright 2013 The Polymer Authors. All rights reserved.
-// Use of this source code is goverened by a BSD-style
-// license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+ */
 
 (function(scope) {
   'use strict';
diff --git a/src/ShadowDOM/wrappers/HTMLCollection.js b/src/ShadowDOM/wrappers/HTMLCollection.js
index 70b5c1a..64cd1bb 100644
--- a/src/ShadowDOM/wrappers/HTMLCollection.js
+++ b/src/ShadowDOM/wrappers/HTMLCollection.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2014 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 (function(scope) {
diff --git a/src/ShadowDOM/wrappers/HTMLContentElement.js b/src/ShadowDOM/wrappers/HTMLContentElement.js
index 7d70007..b2f5f6f 100644
--- a/src/ShadowDOM/wrappers/HTMLContentElement.js
+++ b/src/ShadowDOM/wrappers/HTMLContentElement.js
@@ -1,6 +1,12 @@
-// Copyright 2013 The Polymer Authors. All rights reserved.
-// Use of this source code is goverened by a BSD-style
-// license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+ */
 
 (function(scope) {
   'use strict';
diff --git a/src/ShadowDOM/wrappers/HTMLElement.js b/src/ShadowDOM/wrappers/HTMLElement.js
index b88b710..7326dc3 100644
--- a/src/ShadowDOM/wrappers/HTMLElement.js
+++ b/src/ShadowDOM/wrappers/HTMLElement.js
@@ -1,6 +1,12 @@
-// Copyright 2013 The Polymer Authors. All rights reserved.
-// Use of this source code is goverened by a BSD-style
-// license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+ */
 
 (function(scope) {
   'use strict';
diff --git a/src/ShadowDOM/wrappers/HTMLFormElement.js b/src/ShadowDOM/wrappers/HTMLFormElement.js
index 842066f..9aa71ce 100644
--- a/src/ShadowDOM/wrappers/HTMLFormElement.js
+++ b/src/ShadowDOM/wrappers/HTMLFormElement.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2014 The Polymer Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 (function(scope) {
diff --git a/src/ShadowDOM/wrappers/HTMLImageElement.js b/src/ShadowDOM/wrappers/HTMLImageElement.js
index b6be685..7288f8b 100644
--- a/src/ShadowDOM/wrappers/HTMLImageElement.js
+++ b/src/ShadowDOM/wrappers/HTMLImageElement.js
@@ -1,6 +1,12 @@
-// Copyright 2013 The Polymer Authors. All rights reserved.
-// Use of this source code is goverened by a BSD-style
-// license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+ */
 
 (function(scope) {
   'use strict';
diff --git a/src/ShadowDOM/wrappers/HTMLMediaElement.js b/src/ShadowDOM/wrappers/HTMLMediaElement.js
index 0133d14..006fe47 100644
--- a/src/ShadowDOM/wrappers/HTMLMediaElement.js
+++ b/src/ShadowDOM/wrappers/HTMLMediaElement.js
@@ -1,6 +1,12 @@
-// Copyright 2013 The Polymer Authors. All rights reserved.
-// Use of this source code is goverened by a BSD-style
-// license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+ */
 
 (function(scope) {
   'use strict';
diff --git a/src/ShadowDOM/wrappers/HTMLOptionElement.js b/src/ShadowDOM/wrappers/HTMLOptionElement.js
index ea7a751..63a7fe8 100644
--- a/src/ShadowDOM/wrappers/HTMLOptionElement.js
+++ b/src/ShadowDOM/wrappers/HTMLOptionElement.js
@@ -1,6 +1,12 @@
-// Copyright 2013 The Polymer Authors. All rights reserved.
-// Use of this source code is goverened by a BSD-style
-// license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+ */
 
 (function(scope) {
   'use strict';
diff --git a/src/ShadowDOM/wrappers/HTMLSelectElement.js b/src/ShadowDOM/wrappers/HTMLSelectElement.js
index 72c32a2..e091999 100644
--- a/src/ShadowDOM/wrappers/HTMLSelectElement.js
+++ b/src/ShadowDOM/wrappers/HTMLSelectElement.js
@@ -1,6 +1,12 @@
-// Copyright 2014 The Polymer Authors. All rights reserved.
-// Use of this source code is goverened by a BSD-style
-// license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+ */
 
 (function(scope) {
   'use strict';
diff --git a/src/ShadowDOM/wrappers/HTMLShadowElement.js b/src/ShadowDOM/wrappers/HTMLShadowElement.js
index 78c94e0..32ac49b 100644
--- a/src/ShadowDOM/wrappers/HTMLShadowElement.js
+++ b/src/ShadowDOM/wrappers/HTMLShadowElement.js
@@ -1,6 +1,12 @@
-// Copyright 2013 The Polymer Authors. All rights reserved.
-// Use of this source code is goverened by a BSD-style
-// license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+ */
 
 (function(scope) {
   'use strict';
diff --git a/src/ShadowDOM/wrappers/HTMLTableElement.js b/src/ShadowDOM/wrappers/HTMLTableElement.js
index c1339b6..446e5ac 100644
--- a/src/ShadowDOM/wrappers/HTMLTableElement.js
+++ b/src/ShadowDOM/wrappers/HTMLTableElement.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2014 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 (function(scope) {
diff --git a/src/ShadowDOM/wrappers/HTMLTableRowElement.js b/src/ShadowDOM/wrappers/HTMLTableRowElement.js
index ba06eb2..3a9a484 100644
--- a/src/ShadowDOM/wrappers/HTMLTableRowElement.js
+++ b/src/ShadowDOM/wrappers/HTMLTableRowElement.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2014 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 (function(scope) {
diff --git a/src/ShadowDOM/wrappers/HTMLTableSectionElement.js b/src/ShadowDOM/wrappers/HTMLTableSectionElement.js
index 8e6fc5e..871b8b9 100644
--- a/src/ShadowDOM/wrappers/HTMLTableSectionElement.js
+++ b/src/ShadowDOM/wrappers/HTMLTableSectionElement.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2014 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 (function(scope) {
diff --git a/src/ShadowDOM/wrappers/HTMLTemplateElement.js b/src/ShadowDOM/wrappers/HTMLTemplateElement.js
index 7acdae3..a145bc2 100644
--- a/src/ShadowDOM/wrappers/HTMLTemplateElement.js
+++ b/src/ShadowDOM/wrappers/HTMLTemplateElement.js
@@ -1,6 +1,12 @@
-// Copyright 2013 The Polymer Authors. All rights reserved.
-// Use of this source code is goverened by a BSD-style
-// license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+ */
 
 (function(scope) {
   'use strict';
diff --git a/src/ShadowDOM/wrappers/HTMLUnknownElement.js b/src/ShadowDOM/wrappers/HTMLUnknownElement.js
index 79c16e8..606ddae 100644
--- a/src/ShadowDOM/wrappers/HTMLUnknownElement.js
+++ b/src/ShadowDOM/wrappers/HTMLUnknownElement.js
@@ -1,6 +1,12 @@
-// Copyright 2013 The Polymer Authors. All rights reserved.
-// Use of this source code is goverened by a BSD-style
-// license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+ */
 
 (function(scope) {
   'use strict';
diff --git a/src/ShadowDOM/wrappers/Node.js b/src/ShadowDOM/wrappers/Node.js
index 82364b6..d174de6 100644
--- a/src/ShadowDOM/wrappers/Node.js
+++ b/src/ShadowDOM/wrappers/Node.js
@@ -1,7 +1,11 @@
 /**
- * Copyright 2012 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 (function(scope) {
diff --git a/src/ShadowDOM/wrappers/NodeList.js b/src/ShadowDOM/wrappers/NodeList.js
index 8c5322a..1461592 100644
--- a/src/ShadowDOM/wrappers/NodeList.js
+++ b/src/ShadowDOM/wrappers/NodeList.js
@@ -1,6 +1,12 @@
-// Copyright 2012 The Polymer Authors. All rights reserved.
-// Use of this source code is goverened by a BSD-style
-// license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+ */
 
 (function(scope) {
   'use strict';
diff --git a/src/ShadowDOM/wrappers/Range.js b/src/ShadowDOM/wrappers/Range.js
index 7af9c21..cf9a63b 100644
--- a/src/ShadowDOM/wrappers/Range.js
+++ b/src/ShadowDOM/wrappers/Range.js
@@ -1,6 +1,12 @@
-// Copyright 2013 The Polymer Authors. All rights reserved.
-// Use of this source code is goverened by a BSD-style
-// license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+ */
 
 (function(scope) {
   'use strict';
diff --git a/src/ShadowDOM/wrappers/SVGElement.js b/src/ShadowDOM/wrappers/SVGElement.js
index c92084d..366d3fa 100644
--- a/src/ShadowDOM/wrappers/SVGElement.js
+++ b/src/ShadowDOM/wrappers/SVGElement.js
@@ -1,6 +1,12 @@
-// Copyright 2014 The Polymer Authors. All rights reserved.
-// Use of this source code is goverened by a BSD-style
-// license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+ */
 
 (function(scope) {
   'use strict';
diff --git a/src/ShadowDOM/wrappers/SVGElementInstance.js b/src/ShadowDOM/wrappers/SVGElementInstance.js
index 75598a4..5fd9e46 100644
--- a/src/ShadowDOM/wrappers/SVGElementInstance.js
+++ b/src/ShadowDOM/wrappers/SVGElementInstance.js
@@ -1,6 +1,12 @@
-// Copyright 2014 The Polymer Authors. All rights reserved.
-// Use of this source code is goverened by a BSD-style
-// license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+ */
 
 (function(scope) {
   'use strict';
diff --git a/src/ShadowDOM/wrappers/SVGUseElement.js b/src/ShadowDOM/wrappers/SVGUseElement.js
index 7f91363..0ff18ed 100644
--- a/src/ShadowDOM/wrappers/SVGUseElement.js
+++ b/src/ShadowDOM/wrappers/SVGUseElement.js
@@ -1,6 +1,12 @@
-// Copyright 2014 The Polymer Authors. All rights reserved.
-// Use of this source code is goverened by a BSD-style
-// license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+ */
 
 (function(scope) {
   'use strict';
diff --git a/src/ShadowDOM/wrappers/Selection.js b/src/ShadowDOM/wrappers/Selection.js
index e35c437..7c3104a 100644
--- a/src/ShadowDOM/wrappers/Selection.js
+++ b/src/ShadowDOM/wrappers/Selection.js
@@ -1,6 +1,12 @@
-// Copyright 2014 The Polymer Authors. All rights reserved.
-// Use of this source code is goverened by a BSD-style
-// license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+ */
 
 (function(scope) {
   'use strict';
diff --git a/src/ShadowDOM/wrappers/ShadowRoot.js b/src/ShadowDOM/wrappers/ShadowRoot.js
index 7e6fe2b..011ad33 100644
--- a/src/ShadowDOM/wrappers/ShadowRoot.js
+++ b/src/ShadowDOM/wrappers/ShadowRoot.js
@@ -1,6 +1,12 @@
-// Copyright 2013 The Polymer Authors. All rights reserved.
-// Use of this source code is goverened by a BSD-style
-// license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+ */
 
 (function(scope) {
   'use strict';
diff --git a/src/ShadowDOM/wrappers/Text.js b/src/ShadowDOM/wrappers/Text.js
index fefc501..8559e08 100644
--- a/src/ShadowDOM/wrappers/Text.js
+++ b/src/ShadowDOM/wrappers/Text.js
@@ -1,6 +1,12 @@
-// Copyright 2014 The Polymer Authors. All rights reserved.
-// Use of this source code is goverened by a BSD-style
-// license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+ */
 
 (function(scope) {
   'use strict';
diff --git a/src/ShadowDOM/wrappers/TouchEvent.js b/src/ShadowDOM/wrappers/TouchEvent.js
index f3a4552..7464411 100644
--- a/src/ShadowDOM/wrappers/TouchEvent.js
+++ b/src/ShadowDOM/wrappers/TouchEvent.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2014 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 (function(scope) {
diff --git a/src/ShadowDOM/wrappers/WebGLRenderingContext.js b/src/ShadowDOM/wrappers/WebGLRenderingContext.js
index f009263..1ec867c 100644
--- a/src/ShadowDOM/wrappers/WebGLRenderingContext.js
+++ b/src/ShadowDOM/wrappers/WebGLRenderingContext.js
@@ -1,6 +1,12 @@
-// Copyright 2013 The Polymer Authors. All rights reserved.
-// Use of this source code is goverened by a BSD-style
-// license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+ */
 
 (function(scope) {
   'use strict';
diff --git a/src/ShadowDOM/wrappers/Window.js b/src/ShadowDOM/wrappers/Window.js
index b3e96a4..b9e5010 100644
--- a/src/ShadowDOM/wrappers/Window.js
+++ b/src/ShadowDOM/wrappers/Window.js
@@ -1,6 +1,12 @@
-// Copyright 2013 The Polymer Authors. All rights reserved.
-// Use of this source code is goverened by a BSD-style
-// license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+ */
 
 (function(scope) {
   'use strict';
diff --git a/src/ShadowDOM/wrappers/XMLHttpRequest.js b/src/ShadowDOM/wrappers/XMLHttpRequest.js
index 6c99b79..5ca6d67 100644
--- a/src/ShadowDOM/wrappers/XMLHttpRequest.js
+++ b/src/ShadowDOM/wrappers/XMLHttpRequest.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2014 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 (function(scope) {
diff --git a/src/ShadowDOM/wrappers/elements-with-form-property.js b/src/ShadowDOM/wrappers/elements-with-form-property.js
index b5af480..81c52bb 100644
--- a/src/ShadowDOM/wrappers/elements-with-form-property.js
+++ b/src/ShadowDOM/wrappers/elements-with-form-property.js
@@ -1,6 +1,12 @@
-// Copyright 2013 The Polymer Authors. All rights reserved.
-// Use of this source code is goverened by a BSD-style
-// license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+ */
 
 (function(scope) {
   'use strict';
diff --git a/src/ShadowDOM/wrappers/events.js b/src/ShadowDOM/wrappers/events.js
index 5d3ff68..0054a51 100644
--- a/src/ShadowDOM/wrappers/events.js
+++ b/src/ShadowDOM/wrappers/events.js
@@ -1,6 +1,12 @@
-// Copyright 2013 The Polymer Authors. All rights reserved.
-// Use of this source code is goverened by a BSD-style
-// license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+ */
 
 (function(scope) {
   'use strict';
diff --git a/src/ShadowDOM/wrappers/generic.js b/src/ShadowDOM/wrappers/generic.js
index 9d7a35a..6e5819f 100644
--- a/src/ShadowDOM/wrappers/generic.js
+++ b/src/ShadowDOM/wrappers/generic.js
@@ -1,6 +1,12 @@
-// Copyright 2013 The Polymer Authors. All rights reserved.
-// Use of this source code is goverened by a BSD-style
-// license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+ */
 
 (function(scope) {
   'use strict';
diff --git a/src/ShadowDOM/wrappers/node-interfaces.js b/src/ShadowDOM/wrappers/node-interfaces.js
index 9726094..91843b4 100644
--- a/src/ShadowDOM/wrappers/node-interfaces.js
+++ b/src/ShadowDOM/wrappers/node-interfaces.js
@@ -1,6 +1,12 @@
-// Copyright 2013 The Polymer Authors. All rights reserved.
-// Use of this source code is goverened by a BSD-style
-// license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+ */
 
 (function(scope) {
   'use strict';
diff --git a/src/ShadowDOM/wrappers/override-constructors.js b/src/ShadowDOM/wrappers/override-constructors.js
index 079c3a1..1937b76 100644
--- a/src/ShadowDOM/wrappers/override-constructors.js
+++ b/src/ShadowDOM/wrappers/override-constructors.js
@@ -1,6 +1,12 @@
-// Copyright 2013 The Polymer Authors. All rights reserved.
-// Use of this source code is goverened by a BSD-style
-// license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+ */
 
 (function(scope) {
   'use strict';
diff --git a/src/Template/Template.js b/src/Template/Template.js
new file mode 100644
index 0000000..9ae02ae
--- /dev/null
+++ b/src/Template/Template.js
@@ -0,0 +1,54 @@
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+ */
+
+// minimal template polyfill
+if (typeof HTMLTemplateElement === 'undefined') {
+  (function() {
+
+    var TEMPLATE_TAG = 'template';
+
+    /**
+      Provides a minimal shim for the <template> element.
+    */
+    HTMLTemplateElement = function() {};
+    HTMLTemplateElement.prototype = Object.create(HTMLElement.prototype);
+
+    /**
+      The `decorate` method moves element children to the template's `content`.
+      NOTE: there is no support for dynamically adding elements to templates.
+    */
+    HTMLTemplateElement.decorate = function(template) {
+      if (!template.content) {
+        template.content = template.ownerDocument.createDocumentFragment();
+        var child;
+        while (child = template.firstChild) {
+          template.content.appendChild(child);
+        }
+      }
+    };
+
+    /**
+      The `bootstrap` method is called automatically and "fixes" all
+      <template> elements in the document referenced by the `doc` argument.
+    */
+    HTMLTemplateElement.bootstrap = function(doc) {
+      var templates = doc.querySelectorAll(TEMPLATE_TAG);
+      for (var i=0, l=templates.length, t; (i<l) && (t=templates[i]); i++) {
+        HTMLTemplateElement.decorate(t);
+      }
+    };
+
+    // auto-bootstrapping for main document
+    addEventListener('DOMContentLoaded', function() {
+      HTMLTemplateElement.bootstrap(document);
+    });
+
+  })();
+}
diff --git a/src/WeakMap/WeakMap.js b/src/WeakMap/WeakMap.js
index 712a534..fae6e14 100644
--- a/src/WeakMap/WeakMap.js
+++ b/src/WeakMap/WeakMap.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2012 The Polymer Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 if (typeof WeakMap === 'undefined') {
diff --git a/src/WebComponents/bc.js b/src/WebComponents/bc.js
index 0e21545..d6183a6 100644
--- a/src/WebComponents/bc.js
+++ b/src/WebComponents/bc.js
@@ -1,4 +1,5 @@
-/*
+/**
+ * @license
  * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
  * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
  * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
diff --git a/src/WebComponents/build-lite.json b/src/WebComponents/build-lite.json
index a09d64f..dead003 100644
--- a/src/WebComponents/build-lite.json
+++ b/src/WebComponents/build-lite.json
@@ -2,5 +2,6 @@
   "build/boot.js",
   "../HTMLImports/build.json",
   "../CustomElements/build.json",
+  "../Template/Template.js",
   "unresolved.js"
 ]
diff --git a/src/WebComponents/dom.js b/src/WebComponents/dom.js
index 00a5de5..378504b 100644
--- a/src/WebComponents/dom.js
+++ b/src/WebComponents/dom.js
@@ -1,4 +1,5 @@
-/*
+/**
+ * @license
  * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
  * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
  * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
@@ -79,7 +80,7 @@
     if (window.Polymer === polymerStub) {
       window.Polymer = function() {
         throw new Error('You tried to use polymer without loading it first. To ' +
-          'load polymer, <link rel="import" href="' + 
+          'load polymer, <link rel="import" href="' +
           'components/polymer/polymer.html">');
       };
     }
diff --git a/src/WebComponents/lang.js b/src/WebComponents/lang.js
index c55e1e2..e240b28 100644
--- a/src/WebComponents/lang.js
+++ b/src/WebComponents/lang.js
@@ -1,4 +1,5 @@
-/*
+/**
+ * @license
  * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
  * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
  * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
diff --git a/src/WebComponents/shadowdom.js b/src/WebComponents/shadowdom.js
index 3ff30c1..adff0b4 100644
--- a/src/WebComponents/shadowdom.js
+++ b/src/WebComponents/shadowdom.js
@@ -1,4 +1,5 @@
-/*
+/**
+ * @license
  * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
  * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
  * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
@@ -9,10 +10,10 @@
 
 (function(scope) {
   /**
-    The ShadowDOM polyfill uses a wrapping strategy on dom elements. This is 
-    99% transparent but there are a few nodes (e.g. document) that cannot be 
-    automatically wrapped. Therefore, rarely it's necessary to wrap nodes in 
-    user code. Here we're choosing to make convenient globals `wrap` and 
+    The ShadowDOM polyfill uses a wrapping strategy on dom elements. This is
+    99% transparent but there are a few nodes (e.g. document) that cannot be
+    automatically wrapped. Therefore, rarely it's necessary to wrap nodes in
+    user code. Here we're choosing to make convenient globals `wrap` and
     `unwrap` that can be used whether or not the polyfill is in use.
   */
   // convenient global
diff --git a/src/WebComponents/unresolved.js b/src/WebComponents/unresolved.js
index 8798d64..7006e25 100644
--- a/src/WebComponents/unresolved.js
+++ b/src/WebComponents/unresolved.js
@@ -1,4 +1,5 @@
-/*
+/**
+ * @license
  * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
  * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
  * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
@@ -9,22 +10,22 @@
 
 (function(scope) {
 
-  // It's desireable to provide a default stylesheet 
+  // It's desireable to provide a default stylesheet
   // that's convenient for styling unresolved elements, but
   // it's cumbersome to have to include this manually in every page.
-  // It would make sense to put inside some HTMLImport but 
-  // the HTMLImports polyfill does not allow loading of stylesheets 
+  // It would make sense to put inside some HTMLImport but
+  // the HTMLImports polyfill does not allow loading of stylesheets
   // that block rendering. Therefore this injection is tolerated here.
   //
-  // NOTE: position: relative fixes IE's failure to inherit opacity 
+  // NOTE: position: relative fixes IE's failure to inherit opacity
   // when a child is not statically positioned.
   var style = document.createElement('style');
   style.textContent = ''
       + 'body {'
-      + 'transition: opacity ease-in 0.2s;' 
+      + 'transition: opacity ease-in 0.2s;'
       + ' } \n'
       + 'body[unresolved] {'
-      + 'opacity: 0; display: block; overflow: hidden; position: relative;' 
+      + 'opacity: 0; display: block; overflow: hidden; position: relative;'
       + ' } \n'
       ;
   var head = document.querySelector('head');
diff --git a/tests/CustomElements/html/attributes.html b/tests/CustomElements/html/attributes.html
index db4ea63..3d4120a 100644
--- a/tests/CustomElements/html/attributes.html
+++ b/tests/CustomElements/html/attributes.html
@@ -1,3 +1,4 @@
+<!doctype html>
 <!--
     @license
     Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
@@ -7,7 +8,6 @@
     Code distributed by Google as part of the polymer project is also
     subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
-<!doctype html>
 <html>
   <head>
     <title>Custom Elements: attributes</title>
@@ -30,7 +30,7 @@
         HTMLElement.prototype.setAttribute.call(this, name, value);
       };
       prototype.attributeChangedCallback = function(name, oldValue, newValue) {
-        this.attributeChangedOk = (name === 'squid') && (oldValue === null) 
+        this.attributeChangedOk = (name === 'squid') && (oldValue === null)
             && (newValue === 'tentacles');
       };
       document.registerElement('x-foo', {prototype: prototype});
diff --git a/tests/CustomElements/html/customevent-detail.html b/tests/CustomElements/html/customevent-detail.html
new file mode 100644
index 0000000..db98081
--- /dev/null
+++ b/tests/CustomElements/html/customevent-detail.html
@@ -0,0 +1,34 @@
+<!doctype html>
+<!--
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+-->
+<html>
+  <head>
+    <title>CustomEvent detail test</title>
+    <script src="../../tools/htmltest.js"></script>
+    <script src="../../tools/chai/chai.js"></script>
+    <script src="../../../src/CustomElements/CustomElements.js"></script>
+  </head>
+  <body>
+    <script>
+      addEventListener('WebComponentsReady', function() {
+        var eventName = 'some-event';
+        var eventDetail = 'some-detail';
+
+        document.body.addEventListener(eventName, function(evt) {
+          chai.assert.equal(evt.detail, eventDetail, 'expected CustomEvent detail');
+          done();
+        });
+
+        var evt = new CustomEvent(eventName, {detail: eventDetail});
+        document.body.dispatchEvent(evt);
+      });
+    </script>
+  </body>
+</html>
diff --git a/tests/CustomElements/html/imports.html b/tests/CustomElements/html/imports.html
index 5f97c98..1f6a2cc 100644
--- a/tests/CustomElements/html/imports.html
+++ b/tests/CustomElements/html/imports.html
@@ -1,3 +1,4 @@
+<!doctype html>
 <!--
     @license
     Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
@@ -7,7 +8,6 @@
     Code distributed by Google as part of the polymer project is also
     subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
-<!doctype html>
 <html>
   <head>
     <title>Custom Elements: imports integration</title>
@@ -23,15 +23,15 @@
           document.dispatchEvent(new CustomEvent('HTMLImportsLoaded', {bubbles: true}));
           // parsing hook available
           chai.assert.ok(HTMLImports.__importsParsingHook, 'imports parsing hook installed');
-          //          
+          //
           var doc = document.implementation.createHTMLDocument('Foo');
           doc.body.innerHTML = '<x-foo></x-foo>';
           var link = document.createElement('mock-link');
           link.import = doc;
           HTMLImports.__importsParsingHook(link);
-          //          
+          //
           addEventListener('WebComponentsReady', function() {
-            chai.assert.equal(2, elementsCreated, 'HTML hook allows main document and import document to upgrade');  
+            chai.assert.equal(2, elementsCreated, 'HTML hook allows main document and import document to upgrade');
             done();
           })
         }, 1);
diff --git a/tests/CustomElements/html/shadowdom.html b/tests/CustomElements/html/shadowdom.html
index 0f9d785..c1fa22e 100644
--- a/tests/CustomElements/html/shadowdom.html
+++ b/tests/CustomElements/html/shadowdom.html
@@ -1,3 +1,4 @@
+<!doctype html>
 <!--
     @license
     Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
@@ -7,7 +8,6 @@
     Code distributed by Google as part of the polymer project is also
     subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
-<!doctype html>
 <html>
 <head>
   <title>Custom Elements: shadowdom integration</title>
@@ -33,17 +33,17 @@
         var hostProto = Object.create(proto);
         hostProto.createdCallback = function() {
           proto.createdCallback.call(this);
-          chai.assert.equal(elementsCreated, 1, 'upgraded element');  
+          chai.assert.equal(elementsCreated, 1, 'upgraded element');
           var root = this.createShadowRoot();
           // create element via innerHTML
           root.innerHTML = '<x-foo></x-foo>';
           CustomElements.takeRecords(root);
-          chai.assert.equal(elementsCreated, 2, 'upgraded element inside shadowRoot');  
+          chai.assert.equal(elementsCreated, 2, 'upgraded element inside shadowRoot');
           // now create async to test if the shadowRoot MutationObserver sees
           setTimeout(function() {
             root.innerHTML = '<x-foo></x-foo>';
             CustomElements.takeRecords(root);
-            chai.assert.equal(elementsCreated, 3, 'upgraded element created async inside shadowRoot');  
+            chai.assert.equal(elementsCreated, 3, 'upgraded element created async inside shadowRoot');
             done();
           }, 50);
 
diff --git a/tests/CustomElements/html/upgrade-dcl.html b/tests/CustomElements/html/upgrade-dcl.html
index c1fc49d..a2686e2 100644
--- a/tests/CustomElements/html/upgrade-dcl.html
+++ b/tests/CustomElements/html/upgrade-dcl.html
@@ -1,3 +1,4 @@
+<!doctype html>
 <!--
     @license
     Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
@@ -7,7 +8,6 @@
     Code distributed by Google as part of the polymer project is also
     subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
-<!doctype html>
 <html>
   <head>
     <title>Custom Elements: upgrade order</title>
@@ -27,7 +27,7 @@
       }
 
       registerTestElement('x-foo');
-      
+
       addEventListener('DOMContentLoaded', function() {
         registerTestElement('x-bar');
       });
diff --git a/tests/CustomElements/html/upgrade-order.html b/tests/CustomElements/html/upgrade-order.html
index 8d45b27..6365e54 100644
--- a/tests/CustomElements/html/upgrade-order.html
+++ b/tests/CustomElements/html/upgrade-order.html
@@ -1,3 +1,4 @@
+<!doctype html>
 <!--
     @license
     Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
@@ -7,7 +8,6 @@
     Code distributed by Google as part of the polymer project is also
     subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
-<!doctype html>
 <html>
   <head>
     <title>Custom Elements: upgrade order</title>
@@ -37,12 +37,12 @@
       registerTestElement('x-grandchild');
 
       var order = [
-          'x-parent', 
+          'x-parent',
           'x-child', 'x-grandchild', 'x-grandchild',
           'x-child', 'x-grandchild', 'x-grandchild',
           'x-parent'
       ];
-      
+
       addEventListener('WebComponentsReady', function() {
         chai.assert.equal(created.length, order.length, 'created length is correct');
         chai.assert.equal(attached.length, order.length, 'attached length is correct');
diff --git a/tests/CustomElements/js/customElements.js b/tests/CustomElements/js/customElements.js
index c492d9b..48a0663 100644
--- a/tests/CustomElements/js/customElements.js
+++ b/tests/CustomElements/js/customElements.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('customElements', function() {
@@ -509,6 +513,7 @@ suite('customElements', function() {
 
 htmlSuite('customElements (html)', function() {
   htmlTest('../html/attributes.html');
+  htmlTest('../html/customevent-detail.html');
   htmlTest('../html/upgrade-order.html');
   htmlTest('../html/upgrade-dcl.html');
   htmlTest('../html/imports.html');
diff --git a/tests/CustomElements/js/documentRegister.js b/tests/CustomElements/js/documentRegister.js
index 8c5c92c..9feec66 100644
--- a/tests/CustomElements/js/documentRegister.js
+++ b/tests/CustomElements/js/documentRegister.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 
diff --git a/tests/CustomElements/js/karma-defer-tests.js b/tests/CustomElements/js/karma-defer-tests.js
index c011985..fd3634c 100644
--- a/tests/CustomElements/js/karma-defer-tests.js
+++ b/tests/CustomElements/js/karma-defer-tests.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 // defer start of tests until after WebComponentsReady event
diff --git a/tests/CustomElements/js/observe.js b/tests/CustomElements/js/observe.js
index 5d33490..ecb6a0f 100644
--- a/tests/CustomElements/js/observe.js
+++ b/tests/CustomElements/js/observe.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('observe', function() {
@@ -16,7 +20,7 @@ suite('observe', function() {
   teardown(function() {
     document.body.removeChild(work);
   });
-  
+
   function registerTestComponent(inName, inValue) {
     var proto = Object.create(HTMLElement.prototype);
     proto.value = inValue || 'value';
@@ -24,7 +28,7 @@ suite('observe', function() {
       prototype: proto
     });
   }
-  
+
   function testElements(node, selector, value) {
     Array.prototype.forEach.call(node.querySelectorAll(selector), function(n) {
       assert.equal(n.value, value);
diff --git a/tests/CustomElements/js/upgrade.js b/tests/CustomElements/js/upgrade.js
index adac88a..cbc1a6c 100644
--- a/tests/CustomElements/js/upgrade.js
+++ b/tests/CustomElements/js/upgrade.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('upgradeElements', function() {
@@ -16,7 +20,7 @@ suite('upgradeElements', function() {
   teardown(function() {
     document.body.removeChild(work);
   });
-  
+
   function registerTestComponent(inName, inValue) {
     var proto = Object.create(HTMLElement.prototype);
     proto.value = inValue || 'value';
@@ -24,7 +28,7 @@ suite('upgradeElements', function() {
       prototype: proto
     });
   }
-  
+
   test('CustomElements.upgrade upgrades custom element syntax', function() {
     registerTestComponent('x-foo31', 'foo');
     work.innerHTML = '<x-foo31>Foo</x-foo31>';
@@ -41,14 +45,14 @@ suite('upgradeElements', function() {
     assert.equal(xfoo.value, 'foo');
     done();
   });
-  
+
   test('document.register upgrades custom element syntax', function() {
     work.innerHTML = '<x-foo33>Foo</x-foo33>';
     registerTestComponent('x-foo33', 'foo');
     var xfoo = work.firstChild;
     assert.equal(xfoo.value, 'foo');
   });
-  
+
   test('CustomElements.upgrade upgrades custom element syntax', function() {
     registerTestComponent('x-zot', 'zot');
     registerTestComponent('x-zim', 'zim');
@@ -58,7 +62,7 @@ suite('upgradeElements', function() {
     assert.equal(xzot.value, 'zot');
     assert.equal(xzim.value, 'zim');
   });
-  
+
   test('CustomElements.upgrade upgrades native extendor', function() {
     var XButtonProto = Object.create(HTMLButtonElement.prototype);
     XButtonProto.test = 'xbutton';
@@ -66,14 +70,14 @@ suite('upgradeElements', function() {
       extends: 'button',
       prototype: XButtonProto
     });
-    
+
     work.innerHTML = '<button is="x-button"></button>';
     var xbutton = work.firstChild;
     CustomElements.upgradeAll(xbutton);
     assert.equal(xbutton.test, 'xbutton');
   });
-  
-  
+
+
   test('CustomElements.upgrade upgrades extendor of native extendor', function() {
     var XInputProto = Object.create(HTMLInputElement.prototype);
     XInputProto.xInput = 'xInput';
@@ -93,8 +97,8 @@ suite('upgradeElements', function() {
     assert.equal(x.xInput, 'xInput');
     assert.equal(x.xSpecialInput, 'xSpecialInput');
   });
-  
-  
+
+
   test('CustomElements.upgrade upgrades native extendor', function() {
     var YButtonProto = Object.create(HTMLButtonElement.prototype);
     YButtonProto.test = 'ybutton';
@@ -102,7 +106,7 @@ suite('upgradeElements', function() {
       extends: 'button',
       prototype: YButtonProto
     });
-    
+
     work.innerHTML = '<button is="y-button">0</button>' +
       '<div><button is="y-button">1</button></div>' +
       '<div><div><button is="y-button">2</button></div></div>';
@@ -114,4 +118,4 @@ suite('upgradeElements', function() {
     });
   });
 
-});
\ No newline at end of file
+});
diff --git a/tests/CustomElements/runner.html b/tests/CustomElements/runner.html
index d2daf41..966794c 100644
--- a/tests/CustomElements/runner.html
+++ b/tests/CustomElements/runner.html
@@ -1,8 +1,12 @@
-<!DOCTYPE html>
+<!doctype html>
 <!--
-Copyright 2013 The Polymer Authors. All rights reserved.
-Use of this source code is governed by a BSD-style
-license that can be found in the LICENSE file.
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 <title>CustomElements Tests</title>
 <meta charset="utf-8">
diff --git a/tests/CustomElements/tests.js b/tests/CustomElements/tests.js
index a454b15..56efd1f 100644
--- a/tests/CustomElements/tests.js
+++ b/tests/CustomElements/tests.js
@@ -1,15 +1,19 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 (function() {
-  
+
   var file = 'tests.js';
   var base;
 
-  var src = 
+  var src =
     document.querySelector('script[src*="' + file + '"]').getAttribute('src');
   var base = src.slice(0, src.indexOf(file));
 
@@ -25,4 +29,4 @@
     document.write('<script src="' + base + 'js/' + src + '"></script>');
   });
 
-})();
\ No newline at end of file
+})();
diff --git a/tests/HTMLImports/html/HTMLImports.html b/tests/HTMLImports/html/HTMLImports.html
index 33b4740..98be3a9 100644
--- a/tests/HTMLImports/html/HTMLImports.html
+++ b/tests/HTMLImports/html/HTMLImports.html
@@ -1,3 +1,4 @@
+<!doctype html>
 <!--
     @license
     Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
@@ -7,7 +8,6 @@
     Code distributed by Google as part of the polymer project is also
     subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
-<!doctype html>
 <html>
   <head>
     <title>HTML Imports Test</title>
diff --git a/tests/HTMLImports/html/HTMLImportsLoaded-native.html b/tests/HTMLImports/html/HTMLImportsLoaded-native.html
index f474a18..386ce50 100644
--- a/tests/HTMLImports/html/HTMLImportsLoaded-native.html
+++ b/tests/HTMLImports/html/HTMLImportsLoaded-native.html
@@ -1,3 +1,4 @@
+<!doctype html>
 <!--
     @license
     Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
@@ -7,7 +8,6 @@
     Code distributed by Google as part of the polymer project is also
     subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
-<!doctype html>
 <html>
   <head>
     <title>HTMLImportsLoaded, native</title>
diff --git a/tests/HTMLImports/html/base/load-base.html b/tests/HTMLImports/html/base/load-base.html
index bb1bfdb..9d6f710 100644
--- a/tests/HTMLImports/html/base/load-base.html
+++ b/tests/HTMLImports/html/base/load-base.html
@@ -1,3 +1,4 @@
+<!doctype html>
 <!--
     @license
     Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
@@ -7,7 +8,6 @@
     Code distributed by Google as part of the polymer project is also
     subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
-<!doctype html>
 <html>
   <head>
     <title>base load test</title>
diff --git a/tests/HTMLImports/html/csp.html b/tests/HTMLImports/html/csp.html
index be3e53b..4d3ba78 100644
--- a/tests/HTMLImports/html/csp.html
+++ b/tests/HTMLImports/html/csp.html
@@ -1,3 +1,4 @@
+<!doctype html>
 <!--
     @license
     Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
@@ -7,14 +8,13 @@
     Code distributed by Google as part of the polymer project is also
     subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
-<!doctype html>
 <html>
   <head>
     <title>parser Test</title>
     <script src="../../tools/htmltest.js"></script>
     <script src="../../tools/chai/chai.js"></script>
     <script src="../../../src/HTMLImports/HTMLImports.js"></script>
-    
+
     <meta http-equiv='Content-Security-Policy' content="script-src 'self';">
     <link rel="import" href="imports/csp-import-1.html">
   </head>
diff --git a/tests/HTMLImports/html/csp.js b/tests/HTMLImports/html/csp.js
index fd4a5eb..30eee44 100644
--- a/tests/HTMLImports/html/csp.js
+++ b/tests/HTMLImports/html/csp.js
@@ -1,4 +1,4 @@
-/*
+/**
  * @license
  * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
  * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
@@ -12,4 +12,4 @@ addEventListener('HTMLImportsLoaded', function() {
   chai.assert.ok(window.externalScriptParsed1, 'externalScriptParsed1');
   chai.assert.ok(window.externalScriptParsed2, 'externalScriptParsed2');
   done();
-});
\ No newline at end of file
+});
diff --git a/tests/HTMLImports/html/currentScript.html b/tests/HTMLImports/html/currentScript.html
index e34f65c..abb3603 100644
--- a/tests/HTMLImports/html/currentScript.html
+++ b/tests/HTMLImports/html/currentScript.html
@@ -1,3 +1,4 @@
+<!doctype html>
 <!--
     @license
     Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
@@ -7,7 +8,6 @@
     Code distributed by Google as part of the polymer project is also
     subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
-<!doctype html>
 <html>
   <head>
     <title>_currentScript Test</title>
diff --git a/tests/HTMLImports/html/customevent-detail.html b/tests/HTMLImports/html/customevent-detail.html
new file mode 100644
index 0000000..0105f1b
--- /dev/null
+++ b/tests/HTMLImports/html/customevent-detail.html
@@ -0,0 +1,34 @@
+<!doctype html>
+<!--
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+-->
+<html>
+  <head>
+    <title>CustomEvent detail test</title>
+    <script src="../../tools/htmltest.js"></script>
+    <script src="../../tools/chai/chai.js"></script>
+    <script src="../../../src/HTMLImports/HTMLImports.js"></script>
+  </head>
+  <body>
+    <script>
+      addEventListener('HTMLImportsLoaded', function() {
+        var eventName = 'some-event';
+        var eventDetail = 'some-detail';
+
+        document.body.addEventListener(eventName, function(evt) {
+          chai.assert.equal(evt.detail, eventDetail, 'expected CustomEvent detail');
+          done();
+        });
+
+        var evt = new CustomEvent(eventName, {detail: eventDetail});
+        document.body.dispatchEvent(evt);
+      });
+    </script>
+  </body>
+</html>
diff --git a/tests/HTMLImports/html/dedupe.html b/tests/HTMLImports/html/dedupe.html
index f70a6ec..9fb78c4 100644
--- a/tests/HTMLImports/html/dedupe.html
+++ b/tests/HTMLImports/html/dedupe.html
@@ -1,3 +1,4 @@
+<!doctype html>
 <!--
     @license
     Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
@@ -7,7 +8,6 @@
     Code distributed by Google as part of the polymer project is also
     subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
-<!doctype html>
 <html>
   <head>
     <title>HTML dedupe Test</title>
diff --git a/tests/HTMLImports/html/dynamic-elements.html b/tests/HTMLImports/html/dynamic-elements.html
index 9ebc2bf..3b4d839 100644
--- a/tests/HTMLImports/html/dynamic-elements.html
+++ b/tests/HTMLImports/html/dynamic-elements.html
@@ -1,3 +1,4 @@
+<!doctype html>
 <!--
     @license
     Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
@@ -7,7 +8,6 @@
     Code distributed by Google as part of the polymer project is also
     subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
-<!doctype html>
 <html>
 <head>
   <title>HTML Imports Dynamic Elements</title>
diff --git a/tests/HTMLImports/html/dynamic.html b/tests/HTMLImports/html/dynamic.html
index 48c02a8..124eb09 100644
--- a/tests/HTMLImports/html/dynamic.html
+++ b/tests/HTMLImports/html/dynamic.html
@@ -1,3 +1,4 @@
+<!doctype html>
 <!--
     @license
     Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
@@ -7,7 +8,6 @@
     Code distributed by Google as part of the polymer project is also
     subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
-<!doctype html>
 <html>
   <head>
     <title>HTML Imports Dynamic</title>
@@ -16,7 +16,7 @@
     <script src="../../../src/HTMLImports/HTMLImports.js"></script>
   </head>
   <body>
-    
+
     <script>
       document.addEventListener('DOMContentLoaded', function() {
         // some time later
diff --git a/tests/HTMLImports/html/encoding.html b/tests/HTMLImports/html/encoding.html
index 65d5d78..293fd19 100644
--- a/tests/HTMLImports/html/encoding.html
+++ b/tests/HTMLImports/html/encoding.html
@@ -1,3 +1,4 @@
+<!doctype html>
 <!--
     @license
     Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
@@ -7,7 +8,6 @@
     Code distributed by Google as part of the polymer project is also
     subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
-<!DOCTYPE html>
 <html lang="en">
 <head>
   <meta charset="UTF-8">
diff --git a/tests/HTMLImports/html/imports/csp-script-1.js b/tests/HTMLImports/html/imports/csp-script-1.js
index 6a6b166..bcff149 100644
--- a/tests/HTMLImports/html/imports/csp-script-1.js
+++ b/tests/HTMLImports/html/imports/csp-script-1.js
@@ -1,4 +1,4 @@
-/*
+/**
  * @license
  * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
  * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
@@ -8,4 +8,4 @@
  * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
-window.externalScriptParsed1 = new Date().getTime();
\ No newline at end of file
+window.externalScriptParsed1 = new Date().getTime();
diff --git a/tests/HTMLImports/html/imports/csp-script-2.js b/tests/HTMLImports/html/imports/csp-script-2.js
index 12cb041..0f3534c 100644
--- a/tests/HTMLImports/html/imports/csp-script-2.js
+++ b/tests/HTMLImports/html/imports/csp-script-2.js
@@ -1,4 +1,4 @@
-/*
+/**
  * @license
  * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
  * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
@@ -8,4 +8,4 @@
  * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
-window.externalScriptParsed2 = new Date().getTime();
\ No newline at end of file
+window.externalScriptParsed2 = new Date().getTime();
diff --git a/tests/HTMLImports/html/imports/current-script.js b/tests/HTMLImports/html/imports/current-script.js
index c93714c..029af75 100644
--- a/tests/HTMLImports/html/imports/current-script.js
+++ b/tests/HTMLImports/html/imports/current-script.js
@@ -1,4 +1,4 @@
-/*
+/**
  * @license
  * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
  * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
@@ -10,4 +10,4 @@
 
 remoteCurrentScriptExecuted = window.remoteCurrentScriptExecuted || 0;
 remoteCurrentScriptExecuted++;
-chai.assert.ok(document._currentScript);
\ No newline at end of file
+chai.assert.ok(document._currentScript);
diff --git a/tests/HTMLImports/html/imports/external-script.js b/tests/HTMLImports/html/imports/external-script.js
index 45d61c2..cf69594 100644
--- a/tests/HTMLImports/html/imports/external-script.js
+++ b/tests/HTMLImports/html/imports/external-script.js
@@ -1,4 +1,4 @@
-/*
+/**
  * @license
  * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
  * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
diff --git a/tests/HTMLImports/html/imports/sheet1.css b/tests/HTMLImports/html/imports/sheet1.css
index 4bdca7b..f68768c 100644
--- a/tests/HTMLImports/html/imports/sheet1.css
+++ b/tests/HTMLImports/html/imports/sheet1.css
@@ -1,4 +1,4 @@
-/*
+/**
  * @license
  * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
  * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
@@ -14,4 +14,4 @@
 
 .overridden {
 	background-color: green;
-}
\ No newline at end of file
+}
diff --git a/tests/HTMLImports/html/imports/sheet2.css b/tests/HTMLImports/html/imports/sheet2.css
index 5585347..a184a88 100644
--- a/tests/HTMLImports/html/imports/sheet2.css
+++ b/tests/HTMLImports/html/imports/sheet2.css
@@ -1,4 +1,4 @@
-/*
+/**
  * @license
  * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
  * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
@@ -10,4 +10,4 @@
 
 .blue {
   background-color: blue;
-}
\ No newline at end of file
+}
diff --git a/tests/HTMLImports/html/imports/sheet3.css b/tests/HTMLImports/html/imports/sheet3.css
index 663de4e..723cf48 100644
--- a/tests/HTMLImports/html/imports/sheet3.css
+++ b/tests/HTMLImports/html/imports/sheet3.css
@@ -1,4 +1,4 @@
-/*
+/**
  * @license
  * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
  * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
@@ -10,4 +10,4 @@
 
 .orange {
   background-color: orange;
-}
\ No newline at end of file
+}
diff --git a/tests/HTMLImports/html/imports/style-elements-import.html b/tests/HTMLImports/html/imports/style-elements-import.html
index 575fea3..6e75b7e 100644
--- a/tests/HTMLImports/html/imports/style-elements-import.html
+++ b/tests/HTMLImports/html/imports/style-elements-import.html
@@ -9,11 +9,16 @@
 -->
 <style>
 	.styled {
-		background: red;
+		background: blue;
 	}
 </style>
 <style>
 	.overridden-style {
 		background: red;
 	}
+</style>
+<style>
+    .styled {
+        background: red;
+    }
 </style>
\ No newline at end of file
diff --git a/tests/HTMLImports/html/imports/styles.css b/tests/HTMLImports/html/imports/styles.css
index 48b1fd6..db41ba8 100644
--- a/tests/HTMLImports/html/imports/styles.css
+++ b/tests/HTMLImports/html/imports/styles.css
@@ -1,4 +1,4 @@
-/*
+/**
  * @license
  * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
  * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
diff --git a/tests/HTMLImports/html/load-404.html b/tests/HTMLImports/html/load-404.html
index f306fde..4b34925 100644
--- a/tests/HTMLImports/html/load-404.html
+++ b/tests/HTMLImports/html/load-404.html
@@ -1,3 +1,4 @@
+<!doctype html>
 <!--
     @license
     Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
@@ -7,7 +8,6 @@
     Code distributed by Google as part of the polymer project is also
     subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
-<!doctype html>
 <html>
   <head>
     <title>load ready 404 test</title>
@@ -24,7 +24,7 @@
     </script>
     <link rel="import" href="imports/404-1.html" onerror="errorHandler()">
     <link rel="import" href="imports/404-2.html" onerror="errorHandler()">
-    
+
   </head>
   <body>
     <script>
diff --git a/tests/HTMLImports/html/load-loop.html b/tests/HTMLImports/html/load-loop.html
index 126c95c..744e84e 100644
--- a/tests/HTMLImports/html/load-loop.html
+++ b/tests/HTMLImports/html/load-loop.html
@@ -1,3 +1,4 @@
+<!doctype html>
 <!--
     @license
     Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
@@ -7,7 +8,6 @@
     Code distributed by Google as part of the polymer project is also
     subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
-<!doctype html>
 <html>
   <head>
     <title>load loop Test</title>
diff --git a/tests/HTMLImports/html/load.html b/tests/HTMLImports/html/load.html
index 63fe490..b6c225a 100644
--- a/tests/HTMLImports/html/load.html
+++ b/tests/HTMLImports/html/load.html
@@ -1,3 +1,4 @@
+<!doctype html>
 <!--
     @license
     Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
@@ -7,7 +8,6 @@
     Code distributed by Google as part of the polymer project is also
     subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
-<!doctype html>
 <html>
   <head>
     <title>load event Test</title>
diff --git a/tests/HTMLImports/html/parser.html b/tests/HTMLImports/html/parser.html
index 3e81c03..53cd3ab 100644
--- a/tests/HTMLImports/html/parser.html
+++ b/tests/HTMLImports/html/parser.html
@@ -1,3 +1,4 @@
+<!doctype html>
 <!--
     @license
     Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
@@ -7,7 +8,6 @@
     Code distributed by Google as part of the polymer project is also
     subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
-<!doctype html>
 <html>
   <head>
     <title>parser Test</title>
diff --git a/tests/HTMLImports/html/redirect/load-redirect.html b/tests/HTMLImports/html/redirect/load-redirect.html
index 2e163c7..637fffb 100644
--- a/tests/HTMLImports/html/redirect/load-redirect.html
+++ b/tests/HTMLImports/html/redirect/load-redirect.html
@@ -1,3 +1,4 @@
+<!doctype html>
 <!--
     @license
     Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
@@ -7,7 +8,6 @@
     Code distributed by Google as part of the polymer project is also
     subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
-<!doctype html>
 <html>
 <head>
   <title>load redirect Test</title>
diff --git a/tests/HTMLImports/html/style-links.html b/tests/HTMLImports/html/style-links.html
index d2119d6..fa6906e 100644
--- a/tests/HTMLImports/html/style-links.html
+++ b/tests/HTMLImports/html/style-links.html
@@ -1,3 +1,4 @@
+<!doctype html>
 <!--
     @license
     Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
@@ -7,7 +8,6 @@
     Code distributed by Google as part of the polymer project is also
     subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
-<!doctype html>
 <html>
 <head>
   <title>Style Links Test</title>
@@ -40,12 +40,12 @@
 
   <script>
     addEventListener('HTMLImportsLoaded', function() {
-    
+
       // NOTE: IE requires asynchrony here
-      setTimeout(function() {  
+      setTimeout(function() {
         var imp = document.head.querySelector('link[rel=import]');
         chai.assert.ok(imp.import, 'import has content');
-        
+
         function computedStyle(selector) {
           return getComputedStyle(document.querySelector(selector));
         }
@@ -59,8 +59,8 @@
         chai.assert.equal(computedStyle('.styled').backgroundColor, 'rgb(255, 0, 0)');
         // styles in style are applied in the correct order and overriddable
         chai.assert.equal(computedStyle('.overridden-style').backgroundColor, 'rgb(0, 0, 0)');
-        
-        
+
+
         done();
       });
     });
diff --git a/tests/HTMLImports/html/style-paths.html b/tests/HTMLImports/html/style-paths.html
index afc5d93..3f61419 100644
--- a/tests/HTMLImports/html/style-paths.html
+++ b/tests/HTMLImports/html/style-paths.html
@@ -1,3 +1,4 @@
+<!doctype html>
 <!--
     @license
     Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
@@ -7,7 +8,6 @@
     Code distributed by Google as part of the polymer project is also
     subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
-<!DOCTYPE html>
 <html lang="en">
 <head>
   <meta charset="UTF-8">
@@ -22,13 +22,13 @@
   <div class="image" style="height: 20px;"></div>
   <div style="font-family: 'Source Code Pro'">Source Code Pro</div>
   <script>
-  
+
   document.addEventListener('HTMLImportsLoaded', function() {
     // NOTE: IE requires asynchrony here
-    setTimeout(function() {  
+    setTimeout(function() {
       var i = document.querySelector('[rel=import]');
       var doc = i.import;
-      
+
       var red = document.querySelector('.red');
       chai.assert.equal(getComputedStyle(red).backgroundColor, 'rgb(255, 0, 0)', 'style in @import applied');
       var image = document.querySelector('.image');
@@ -41,12 +41,12 @@
       if (!HTMLImports.useNative) {
         var style = document.querySelector('style');
         chai.assert.ok(style.sheet);
-        chai.assert.equal(style.sheet.cssRules[2].href, 
+        chai.assert.equal(style.sheet.cssRules[2].href,
             'http://fonts.googleapis.com/css?family=Open+Sans:300,300italic,600,800|Source+Code+Pro',
             '@import url() form rule has proper url')
       }
 
-      done();  
+      done();
     });
   });
   </script>
diff --git a/tests/HTMLImports/html/template-script.html b/tests/HTMLImports/html/template-script.html
index 5fa9aa0..7706d91 100644
--- a/tests/HTMLImports/html/template-script.html
+++ b/tests/HTMLImports/html/template-script.html
@@ -1,3 +1,4 @@
+<!doctype html>
 <!--
     @license
     Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
@@ -7,7 +8,6 @@
     Code distributed by Google as part of the polymer project is also
     subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
-<!doctype html>
 <html>
   <head>
     <title>template script test</title>
diff --git a/tests/HTMLImports/runner.html b/tests/HTMLImports/runner.html
index a459fc6..9df8016 100644
--- a/tests/HTMLImports/runner.html
+++ b/tests/HTMLImports/runner.html
@@ -1,8 +1,12 @@
-<!DOCTYPE html>
+<!doctype html>
 <!--
-Copyright 2013 The Polymer Authors. All rights reserved.
-Use of this source code is governed by a BSD-style
-license that can be found in the LICENSE file.
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 <title>HTMLImports Tests</title>
 <meta charset="utf-8">
diff --git a/tests/HTMLImports/tests.js b/tests/HTMLImports/tests.js
index 3c6eb13..83f0879 100644
--- a/tests/HTMLImports/tests.js
+++ b/tests/HTMLImports/tests.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 (function() {
 
@@ -18,6 +22,7 @@ htmlSuite('HTMLImports', function() {
   htmlTest('html/dedupe.html');
   htmlTest('html/dynamic.html');
   htmlTest('html/csp.html');
+  htmlTest('html/customevent-detail.html');
   htmlTest('html/encoding.html');
   htmlTest('html/HTMLImportsLoaded-native.html');
   // NOTE: The MO polyfill does not function on disconnected documents
@@ -27,4 +32,4 @@ htmlSuite('HTMLImports', function() {
   }
 });
 
-})();
\ No newline at end of file
+})();
diff --git a/tests/MutationObservers/attributes.js b/tests/MutationObservers/attributes.js
index 73d697b..5666fbb 100644
--- a/tests/MutationObservers/attributes.js
+++ b/tests/MutationObservers/attributes.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2012 The Polymer Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('JsMutationObserver attributes', function() {
@@ -273,4 +277,4 @@ suite('JsMutationObserver attributes', function() {
     });
   });
 
-});
\ No newline at end of file
+});
diff --git a/tests/MutationObservers/callback.js b/tests/MutationObservers/callback.js
index b3083c7..224d780 100644
--- a/tests/MutationObservers/callback.js
+++ b/tests/MutationObservers/callback.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2012 The Polymer Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('JsMutationObserver callback', function() {
@@ -69,4 +73,4 @@ suite('JsMutationObserver callback', function() {
     div.setAttribute('a', 'A');
   });
 
-});
\ No newline at end of file
+});
diff --git a/tests/MutationObservers/characterData.js b/tests/MutationObservers/characterData.js
index 498dc05..76bb480 100644
--- a/tests/MutationObservers/characterData.js
+++ b/tests/MutationObservers/characterData.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2012 The Polymer Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('JsMutationObserver characterData', function() {
@@ -103,4 +107,4 @@ suite('JsMutationObserver characterData', function() {
     });
   });
 
-});
\ No newline at end of file
+});
diff --git a/tests/MutationObservers/childList.js b/tests/MutationObservers/childList.js
index 8ff4e4f..a54f915 100644
--- a/tests/MutationObservers/childList.js
+++ b/tests/MutationObservers/childList.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2012 The Polymer Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('JsMutationObserver childList', function() {
@@ -374,4 +378,4 @@ suite('JsMutationObserver childList', function() {
     });
   });
 
-});
\ No newline at end of file
+});
diff --git a/tests/MutationObservers/mixed.js b/tests/MutationObservers/mixed.js
index eae6a60..8f9a64a 100644
--- a/tests/MutationObservers/mixed.js
+++ b/tests/MutationObservers/mixed.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2012 The Polymer Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('JsMutationObserver mixed types', function() {
@@ -33,4 +37,4 @@ suite('JsMutationObserver mixed types', function() {
     });
   });
 
-});
\ No newline at end of file
+});
diff --git a/tests/MutationObservers/runner.html b/tests/MutationObservers/runner.html
index 983f3e7..ea8c3bc 100644
--- a/tests/MutationObservers/runner.html
+++ b/tests/MutationObservers/runner.html
@@ -1,11 +1,15 @@
-<!DOCTYPE html>
+<!doctype html>
 <!--
-Copyright 2012 The Polymer Authors. All rights reserved.
-Use of this source code is governed by a BSD-style
-license that can be found in the LICENSE file.
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 <meta charset="utf-8">
-    
+
 <!-- Mocha/Chai -->
 <link rel="stylesheet" href="../tools/mocha/mocha.css">
 <script src="../tools/mocha/mocha.js"></script>
diff --git a/tests/MutationObservers/transient.js b/tests/MutationObservers/transient.js
index 7dda83e..0a226d0 100644
--- a/tests/MutationObservers/transient.js
+++ b/tests/MutationObservers/transient.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2012 The Polymer Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('JsMutationObserver transient', function() {
diff --git a/tests/ShadowCSS/html/before-content.html b/tests/ShadowCSS/html/before-content.html
index 9f6fa91..7c32c12 100644
--- a/tests/ShadowCSS/html/before-content.html
+++ b/tests/ShadowCSS/html/before-content.html
@@ -1,11 +1,12 @@
-<!DOCTYPE html>
+<!doctype html>
 <!--
-Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 <html>
 <head>
@@ -50,7 +51,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
   </template>
   <script>
     register('x-test', '', HTMLElement.prototype);
-    
+
     document.addEventListener('WebComponentsReady', function() {
       setTimeout(function() {
         var root = document.querySelector('x-test').shadowRoot;
@@ -67,7 +68,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
       });
     });
   </script>
-  
-  
+
+
 </body>
 </html>
diff --git a/tests/ShadowCSS/html/colon-host.html b/tests/ShadowCSS/html/colon-host.html
index 5970a68..22a80de 100644
--- a/tests/ShadowCSS/html/colon-host.html
+++ b/tests/ShadowCSS/html/colon-host.html
@@ -1,11 +1,12 @@
-<!DOCTYPE html>
+<!doctype html>
 <!--
-Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 <html>
 <head>
@@ -62,7 +63,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
         display: block;
         background: red;
       }
-      
+
       :host(.foo) {
         background: black;
         color: white;
@@ -112,7 +113,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
     </style>
     <div>padding: 20px</div>
   </template>
-  
+
   <script>
     XFoo = register('x-foo', '', HTMLElement.prototype, ['x-foo']);
     XBar = register('x-bar', 'x-foo', XFoo.prototype, ['x-foo', 'x-bar']);
@@ -124,31 +125,31 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
     register('x-button', 'button', HTMLButtonElement.prototype, ['x-button']);
     register('x-anchor', 'a', HTMLAnchorElement.prototype, ['x-anchor']);
   </script>
-  
+
   <h4>Expected: red background</h4>
   <x-foo></x-foo>
-  
+
   <h4>Expected: red background</h4>
   <x-scope></x-scope>
 
   <h4>Expected: green background</h4>
   <button is="x-button">green</button>
-  
+
   <h4>Expected: black background</h4>
   <x-foo class="foo"></x-foo>
-  
+
   <h4>Expected: black background</h4>
   <x-scope class="foo"></x-scope>
-  
+
   <h4>Expected: red background with white text</h4>
   <x-bar></x-bar>
 
   <h4>Expected: red background with white text</h4>
   <x-bar2></x-bar2>
-  
+
   <h4>Expected: red background with black text and orange border</h4>
   <x-zot></x-zot>
-  
+
   <h4>Expected: red background with black text and orange border and 20px padding</h4>
   <x-zim></x-zim>
 
@@ -172,59 +173,59 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
        <x-foo class="foo3"></x-foo>
      </div>
   </div>
-  
+
   <script>
     document.addEventListener('WebComponentsReady', function() {
       var foo = document.querySelector('x-foo');
       chai.assert.equal(getComputedStyle(foo).backgroundColor, 'rgb(255, 0, 0)',
         ':host styles matching * are applied (backgroundColor)');
-      
+
       var foo2 = document.querySelector('x-foo.foo');
       chai.assert.equal(getComputedStyle(foo2).backgroundColor, 'rgb(0, 0, 0)',
-        ':host styles are conditionally applied (backgroundColor)');  
+        ':host styles are conditionally applied (backgroundColor)');
 
       var foo3 = document.querySelector('x-foo.foo3');
       var foo3div = foo3.shadowRoot.querySelector('div');
       chai.assert.equal(getComputedStyle(foo3div).backgroundColor, 'rgb(0, 0, 255)',
-        ':host(:not()) styles are applied (backgroundColor)');  
+        ':host(:not()) styles are applied (backgroundColor)');
 
       var scope = document.querySelector('x-scope');
       chai.assert.equal(getComputedStyle(scope).backgroundColor, 'rgb(255, 0, 0)',
         ':host styles matching :scope  are applied (backgroundColor)');
-        
+
       var scope2 = document.querySelector('x-scope.foo');
       chai.assert.equal(getComputedStyle(scope2).backgroundColor, 'rgb(0, 0, 0)',
-        ':host styles matching :scope are conditionally applied (backgroundColor)');  
-      
+        ':host styles matching :scope are conditionally applied (backgroundColor)');
+
       var bar = document.querySelector('x-bar');
       var barStyle = getComputedStyle(bar);
-      chai.assert.equal(barStyle.backgroundColor, 'rgb(255, 0, 0)', 
+      chai.assert.equal(barStyle.backgroundColor, 'rgb(255, 0, 0)',
         ':host styles are inherited (backgroundColor)');
       chai.assert.equal(barStyle.color, 'rgb(255, 255, 255)',
         ':host styles are combined with inherited :host styles (color)');
 
       var bar2 = document.querySelector('x-bar2');
       var bar2Style = getComputedStyle(bar2);
-      chai.assert.equal(bar2Style.backgroundColor, 'rgb(255, 0, 0)', 
+      chai.assert.equal(bar2Style.backgroundColor, 'rgb(255, 0, 0)',
         ':host styles are inherited (backgroundColor)');
 
       var zot = document.querySelector('x-zot');
       var zotStyle = getComputedStyle(zot);
-      chai.assert.equal(zotStyle.backgroundColor, 'rgb(255, 0, 0)', 
+      chai.assert.equal(zotStyle.backgroundColor, 'rgb(255, 0, 0)',
         ':host styles are inherited (backgroundColor)');
-      chai.assert.equal(zotStyle.borderTopColor, 'rgb(255, 165, 0)', 
+      chai.assert.equal(zotStyle.borderTopColor, 'rgb(255, 165, 0)',
         ':host styles are combined with inherited :host styles (borderTopColor)');
       chai.assert.equal(zotStyle.color, 'rgb(255, 255, 255)',
         ':host styles are applied to given selector (color)');
-        
+
       var zim = document.querySelector('x-zim');
       var zimStyle = getComputedStyle(zim);
-      chai.assert.equal(zimStyle.backgroundColor, 'rgb(255, 0, 0)', 
+      chai.assert.equal(zimStyle.backgroundColor, 'rgb(255, 0, 0)',
         ':host styles are inherited (backgroundColor)');
-      
-      chai.assert.equal(zimStyle.borderTopColor, 'rgb(165, 42, 42)', 
+
+      chai.assert.equal(zimStyle.borderTopColor, 'rgb(165, 42, 42)',
         ':host styles are combined with inherited :host styles (borderTopColor)');
-      chai.assert.equal(zimStyle.borderBottomColor, 'rgb(255, 165, 0)', 
+      chai.assert.equal(zimStyle.borderBottomColor, 'rgb(255, 165, 0)',
         ':host styles are combined with inherited :host styles (borderBottomColor)');
       chai.assert.equal(zimStyle.color, 'rgb(255, 255, 255)',
         ':host styles are applied to given selector (color)');
@@ -236,31 +237,31 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 
       var zim2 = document.querySelector('x-zim2');
       var zimStyle2 = getComputedStyle(zim2);
-      chai.assert.equal(zimStyle2.borderTopColor, 'rgb(255, 165, 0)', 
+      chai.assert.equal(zimStyle2.borderTopColor, 'rgb(255, 165, 0)',
         ':host styles are combined without <shadow> (borderTopColor)');
-      chai.assert.equal(zimStyle2.borderBottomColor, 'rgb(255, 165, 0)', 
+      chai.assert.equal(zimStyle2.borderBottomColor, 'rgb(255, 165, 0)',
         ':host styles are combined without <shadow> (borderBottomColor)');
       chai.assert.equal(zimStyle2.paddingTop, '20px',
         ':host styles are loaded via external sheet in import (paddingTop)');
       chai.assert.equal(zimStyle2.paddingLeft, '20px',
         ':host styles are loaded via external sheet in import (paddingLeft)');
 
-      chai.assert.equal(zimStyle2.backgroundColor, 'rgb(0, 128, 0)', 
+      chai.assert.equal(zimStyle2.backgroundColor, 'rgb(0, 128, 0)',
         ':host(.foo:host) styles are applied (backgroundColor)');
 
       var zim2_2 = document.querySelector('.bar > x-zim2');
       var zimStyle2_2 = getComputedStyle(zim2_2);
-      chai.assert.equal(zimStyle2_2.backgroundColor, 'rgb(0, 128, 0)', 
+      chai.assert.equal(zimStyle2_2.backgroundColor, 'rgb(0, 128, 0)',
         ':host(.foo:host) styles are applied (backgroundColor)');
 
       var zim2_3 = document.querySelector('.foo > x-zim2');
       var zimStyle2_3 = getComputedStyle(zim2_3);
-      chai.assert.notEqual(zimStyle2_3.backgroundColor, 'rgb(0, 128, 0)', 
+      chai.assert.notEqual(zimStyle2_3.backgroundColor, 'rgb(0, 128, 0)',
         ':host(.foo:host) styles are not applied when host doesn\'t contain .foo (backgroundColor)');
 
       var btn = document.querySelector('[is=x-button]');
       var btnStyle = getComputedStyle(btn);
-      chai.assert.equal(btnStyle.backgroundColor, 'rgb(0, 128, 0)', 
+      chai.assert.equal(btnStyle.backgroundColor, 'rgb(0, 128, 0)',
         ':host styles are shimmed for type extension (backgroundColor)');
 
       var a = document.querySelector('[is=x-anchor]');
@@ -270,7 +271,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
         'cancelable': true
       }));
       var aStyle = getComputedStyle(a);
-      chai.assert.equal(aStyle.fontStyle, 'italic', 
+      chai.assert.equal(aStyle.fontStyle, 'italic',
         ':host:pseudoclass styles are shimmed (font-style)');
 
       done();
diff --git a/tests/ShadowCSS/html/combinators-import.css b/tests/ShadowCSS/html/combinators-import.css
index 3a96f50..044b7e9 100644
--- a/tests/ShadowCSS/html/combinators-import.css
+++ b/tests/ShadowCSS/html/combinators-import.css
@@ -1,4 +1,4 @@
-/*
+/**
  * @license
  * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
  * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
diff --git a/tests/ShadowCSS/html/combinators-shadow-import.css b/tests/ShadowCSS/html/combinators-shadow-import.css
index 664edd6..523d9ee 100644
--- a/tests/ShadowCSS/html/combinators-shadow-import.css
+++ b/tests/ShadowCSS/html/combinators-shadow-import.css
@@ -1,4 +1,4 @@
-/*
+/**
  * @license
  * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
  * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
diff --git a/tests/ShadowCSS/html/combinators-shadow.css b/tests/ShadowCSS/html/combinators-shadow.css
index 9a3202e..99531c1 100644
--- a/tests/ShadowCSS/html/combinators-shadow.css
+++ b/tests/ShadowCSS/html/combinators-shadow.css
@@ -1,4 +1,4 @@
-/*
+/**
  * @license
  * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
  * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
@@ -10,4 +10,4 @@
 
 body /deep/ x-zot::shadow .zot-inner {
   background: blue;
-}
\ No newline at end of file
+}
diff --git a/tests/ShadowCSS/html/combinators-shadow.html b/tests/ShadowCSS/html/combinators-shadow.html
index 63023bc..3b61e67 100644
--- a/tests/ShadowCSS/html/combinators-shadow.html
+++ b/tests/ShadowCSS/html/combinators-shadow.html
@@ -1,11 +1,12 @@
-<!DOCTYPE html>
+<!doctype html>
 <!--
-Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 <html>
 <head>
@@ -60,15 +61,15 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
     <div class="zot-inner">inner</div>
   </template>
 
-  
+
   <script>
     XZot = register('x-zot', '', HTMLElement.prototype, ['x-zot']);
     XBar = register('x-bar', '', HTMLElement.prototype, ['x-bar']);
     XFoo = register('x-foo', '', HTMLElement.prototype, ['x-foo']);
   </script>
-  
+
   <x-foo></x-foo>
-  
+
   <script>
     document.addEventListener('WebComponentsReady', function() {
       var foo = document.querySelector('x-foo');
@@ -81,9 +82,9 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
       chai.assert.equal(getComputedStyle(noogy).backgroundColor, 'rgb(0, 0, 255)',
         '^ styles are applied (backgroundColor)');
       var xZot = foo.shadowRoot.querySelector('x-bar').shadowRoot
-          .querySelector('x-zot'); 
+          .querySelector('x-zot');
       var zot = xZot.shadowRoot.querySelector('.zot');
-      
+
       chai.assert.equal(getComputedStyle(zot).backgroundColor, 'rgb(0, 128, 0)',
         '^ styles are applied (backgroundColor)');
       chai.assert.equal(getComputedStyle(zot).color, 'rgb(255, 255, 255)',
@@ -95,8 +96,8 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
         var fooDiv = foo.shadowRoot.querySelector('.foo');
         var zotDiv = xZot.shadowRoot.querySelector('.zot-inner');
         var fooDiv2 = foo.shadowRoot.querySelector('.foo2');
-        
-        // TODO(sorvell): test blocked on 
+
+        // TODO(sorvell): test blocked on
         // https://code.google.com/p/chromium/issues/detail?id=339657
         //chai.assert.equal(getComputedStyle(fooDiv2).backgroundColor, 'rgb(0, 128, 0)',
         //  'combinators applied via stylesheet in import');
diff --git a/tests/ShadowCSS/html/combinators.css b/tests/ShadowCSS/html/combinators.css
index e89c5b9..6927db0 100644
--- a/tests/ShadowCSS/html/combinators.css
+++ b/tests/ShadowCSS/html/combinators.css
@@ -1,4 +1,4 @@
-/*
+/**
  * @license
  * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
  * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
@@ -10,4 +10,4 @@
 
 body ^^ x-zot ^ .zot-inner {
   background: blue;
-}
\ No newline at end of file
+}
diff --git a/tests/ShadowCSS/html/combinators.html b/tests/ShadowCSS/html/combinators.html
index a6f749e..40a2817 100644
--- a/tests/ShadowCSS/html/combinators.html
+++ b/tests/ShadowCSS/html/combinators.html
@@ -1,11 +1,12 @@
-<!DOCTYPE html>
+<!doctype html>
 <!--
-Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 <html>
 <head>
@@ -60,15 +61,15 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
     <div class="zot-inner">inner</div>
   </template>
 
-  
+
   <script>
     XZot = register('x-zot', '', HTMLElement.prototype, ['x-zot']);
     XBar = register('x-bar', '', HTMLElement.prototype, ['x-bar']);
     XFoo = register('x-foo', '', HTMLElement.prototype, ['x-foo']);
   </script>
-  
+
   <x-foo></x-foo>
-  
+
   <script>
     document.addEventListener('WebComponentsReady', function() {
       var foo = document.querySelector('x-foo');
@@ -81,9 +82,9 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
       chai.assert.equal(getComputedStyle(noogy).backgroundColor, 'rgb(0, 0, 255)',
         '^ styles are applied (backgroundColor)');
       var xZot = foo.shadowRoot.querySelector('x-bar').shadowRoot
-          .querySelector('x-zot'); 
+          .querySelector('x-zot');
       var zot = xZot.shadowRoot.querySelector('.zot');
-      
+
       chai.assert.equal(getComputedStyle(zot).backgroundColor, 'rgb(0, 128, 0)',
         '^ styles are applied (backgroundColor)');
       chai.assert.equal(getComputedStyle(zot).color, 'rgb(255, 255, 255)',
@@ -95,8 +96,8 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
         var fooDiv = foo.shadowRoot.querySelector('.foo');
         var zotDiv = xZot.shadowRoot.querySelector('.zot-inner');
         var fooDiv2 = foo.shadowRoot.querySelector('.foo2');
-        
-        // TODO(sorvell): test blocked on 
+
+        // TODO(sorvell): test blocked on
         // https://code.google.com/p/chromium/issues/detail?id=339657
         //chai.assert.equal(getComputedStyle(fooDiv2).backgroundColor, 'rgb(0, 128, 0)',
         //  'combinators applied via stylesheet in import');
diff --git a/tests/ShadowCSS/html/compressed.html b/tests/ShadowCSS/html/compressed.html
index 3366205..60e4e05 100644
--- a/tests/ShadowCSS/html/compressed.html
+++ b/tests/ShadowCSS/html/compressed.html
@@ -1,11 +1,12 @@
-<!DOCTYPE html>
+<!doctype html>
 <!--
-Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 <html>
 <head>
@@ -26,13 +27,13 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
     </style>
     <article>article</article>
   </template>
-  
+
   <script>
     XTest = register('x-test', '', HTMLElement.prototype, ['x-test']);
   </script>
-  
+
   <x-test></x-test>
-  
+
   <script>
     document.addEventListener('WebComponentsReady', function() {
       var sheet = document.querySelector('[shim-shadowdom-css]');
diff --git a/tests/ShadowCSS/html/css-animation.html b/tests/ShadowCSS/html/css-animation.html
index 931b7a3..93000df 100644
--- a/tests/ShadowCSS/html/css-animation.html
+++ b/tests/ShadowCSS/html/css-animation.html
@@ -1,11 +1,12 @@
-<!DOCTYPE html>
+<!doctype html>
 <!--
-Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 <html>
 <head>
@@ -69,6 +70,6 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
     }, 100);
   });
 </script>
-    
+
 </body>
 </html>
diff --git a/tests/ShadowCSS/html/imports/sheet1.css b/tests/ShadowCSS/html/imports/sheet1.css
index de04d15..98f59bb 100644
--- a/tests/ShadowCSS/html/imports/sheet1.css
+++ b/tests/ShadowCSS/html/imports/sheet1.css
@@ -1,4 +1,4 @@
-/*
+/**
  * @license
  * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
  * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
@@ -10,4 +10,4 @@
 
 .red {
   background: red;
-}
\ No newline at end of file
+}
diff --git a/tests/ShadowCSS/html/imports/sheet2.css b/tests/ShadowCSS/html/imports/sheet2.css
index 2df2088..db55f4c 100644
--- a/tests/ShadowCSS/html/imports/sheet2.css
+++ b/tests/ShadowCSS/html/imports/sheet2.css
@@ -1,4 +1,4 @@
-/*
+/**
  * @license
  * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
  * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
@@ -10,4 +10,4 @@
 
 .blue {
   background: blue;
-}
\ No newline at end of file
+}
diff --git a/tests/ShadowCSS/html/polyfill-directive.html b/tests/ShadowCSS/html/polyfill-directive.html
index 665043d..ed8517e 100644
--- a/tests/ShadowCSS/html/polyfill-directive.html
+++ b/tests/ShadowCSS/html/polyfill-directive.html
@@ -1,11 +1,12 @@
-<!DOCTYPE html>
+<!doctype html>
 <!--
-Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 <html>
 <head>
@@ -31,7 +32,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
     <div class="one">Green?</div>
     <div class="two">Red?</div>
   </x-auto>
- 
+
   <template id="x-foo">
     <style>
       :host {
@@ -89,12 +90,12 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
   </template>
 
 
-  
+
   <script>
     XFoo = register('x-foo', '', HTMLElement.prototype);
     XBar = register('x-bar', 'x-foo', HTMLElement.prototype);
     XAuto = register('x-auto', '', HTMLElement.prototype);
-    
+
     document.addEventListener('WebComponentsReady', function() {
       setTimeout(function() {
         // x-foo
@@ -102,41 +103,41 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
         var fooStyle = getComputedStyle(n);
         chai.assert.equal(fooStyle.paddingTop, '10px', 'host attribute style correct');
         var divStyle = getComputedStyle(n.firstElementChild);
-        chai.assert.equal(divStyle.backgroundColor, 
+        chai.assert.equal(divStyle.backgroundColor,
           'rgb(0, 128, 0)', 'single quote polyfill-next-selector');
-        chai.assert.equal(divStyle.color, 
+        chai.assert.equal(divStyle.color,
           'rgb(255, 0, 0)', '@polyfill');
         var sectionStyle = getComputedStyle(n.lastElementChild);
-        chai.assert.equal(sectionStyle.backgroundColor, 
+        chai.assert.equal(sectionStyle.backgroundColor,
           'rgb(255, 165, 0)', 'double quote polyfill-next-selector');
-        chai.assert.equal(sectionStyle.paddingTop, 
+        chai.assert.equal(sectionStyle.paddingTop,
           '10px', 'double quote polyfill-next-selector');
-        chai.assert.equal(sectionStyle.color, 
+        chai.assert.equal(sectionStyle.color,
           'rgb(255, 0, 0)', '@polyfill');
         //
         // x-bar
         var n = document.querySelector('x-bar');
         var divStyle = getComputedStyle(n.firstElementChild);
-        chai.assert.equal(divStyle.backgroundColor, 
+        chai.assert.equal(divStyle.backgroundColor,
           'rgb(0, 128, 0)', 'extended single quote polyfill-next-selector');
-        chai.assert.equal(divStyle.color, 
+        chai.assert.equal(divStyle.color,
           'rgb(255, 0, 0)', '@polyfill');
         var sectionStyle = getComputedStyle(n.lastElementChild);
-        chai.assert.equal(sectionStyle.backgroundColor, 
+        chai.assert.equal(sectionStyle.backgroundColor,
           'rgb(255, 165, 0)', 'extended double quote polyfill-next-selector');
-        chai.assert.equal(sectionStyle.color, 
+        chai.assert.equal(sectionStyle.color,
           'rgb(255, 0, 0)', '@polyfill');
         //
         var auto = document.querySelector('x-auto');
-        chai.assert.equal(getComputedStyle(auto.firstElementChild).backgroundColor, 
+        chai.assert.equal(getComputedStyle(auto.firstElementChild).backgroundColor,
         'rgb(0, 128, 0)', 'auto-replaced ::content');
-        chai.assert.equal(getComputedStyle(auto.lastElementChild).backgroundColor, 
+        chai.assert.equal(getComputedStyle(auto.lastElementChild).backgroundColor,
         'rgb(255, 0, 0)', 'auto-replaced ::content');
         done();
       });
     });
   </script>
-  
-  
+
+
 </body>
 </html>
diff --git a/tests/ShadowCSS/html/polyfill-rule.html b/tests/ShadowCSS/html/polyfill-rule.html
index a316dfc..4ef504a 100644
--- a/tests/ShadowCSS/html/polyfill-rule.html
+++ b/tests/ShadowCSS/html/polyfill-rule.html
@@ -1,11 +1,12 @@
-<!DOCTYPE html>
+<!doctype html>
 <!--
-Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 <html>
 <head>
@@ -50,28 +51,28 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
     </style>
     <content></content>
   </template>
-  
+
   <script>
     XFoo = register('x-foo', '', HTMLElement.prototype);
-    
+
     document.addEventListener('WebComponentsReady', function() {
       var foo = document.querySelector('x-foo');
       var zonkStyle = getComputedStyle(foo.querySelector('.zonk'));
-      chai.assert.equal(zonkStyle.backgroundColor, 
+      chai.assert.equal(zonkStyle.backgroundColor,
         'rgb(255, 0, 0)', 'polyfill-rule, single quote');
-      chai.assert.equal(zonkStyle.paddingTop, 
+      chai.assert.equal(zonkStyle.paddingTop,
         '10px', 'polyfill-rule, double quote');
-      chai.assert.equal(zonkStyle.color, 
+      chai.assert.equal(zonkStyle.color,
         'rgb(0, 0, 255)', '@polyfill-rule');
       var unscopedStyle = getComputedStyle(document.querySelector('.unscoped'));
-      chai.assert.equal(unscopedStyle.backgroundColor, 
+      chai.assert.equal(unscopedStyle.backgroundColor,
         'rgb(0, 0, 0)', 'polyfill-unscoped-rule single quote');
-      chai.assert.equal(unscopedStyle.paddingTop, 
+      chai.assert.equal(unscopedStyle.paddingTop,
         '20px', 'polyfill-unscoped-rule double quote');
       done();
     });
   </script>
-  
-  
+
+
 </body>
 </html>
diff --git a/tests/ShadowCSS/html/pseudo-scoping-strict.html b/tests/ShadowCSS/html/pseudo-scoping-strict.html
index 5612f94..2209ae7 100644
--- a/tests/ShadowCSS/html/pseudo-scoping-strict.html
+++ b/tests/ShadowCSS/html/pseudo-scoping-strict.html
@@ -1,11 +1,12 @@
-<!DOCTYPE html>
+<!doctype html>
 <!--
-Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 <html>
 <head>
@@ -49,7 +50,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
         background: green;
       }
 
-      div::before { 
+      div::before {
         background: blue;
         content: 'zonk';
       }
@@ -58,7 +59,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
         div {
           font-size: 50px;
         }
-      } 
+      }
     </style>
     <div>20px / 50px</div>
     <x-inner></x-inner>
@@ -83,7 +84,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
     register('x-inner', '', HTMLElement.prototype);
     register('x-foo', '', HTMLElement.prototype);
     register('x-button', 'button', HTMLButtonElement.prototype, ['x-button']);
-    
+
     document.addEventListener('WebComponentsReady', function() {
       setTimeout(function() {
         var foo = document.querySelector('x-foo');
@@ -108,15 +109,15 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
             .shadowRoot.querySelector('div');
         var xButtonDivStyle = getComputedStyle(xButtonDiv);
         chai.assert.equal(xButtonDivStyle.backgroundColor, 'rgb(255, 0, 0)',
-          'type extension is properly shimmed');        
+          'type extension is properly shimmed');
         chai.assert.equal(xButtonDivStyle.fontSize, '50px',
-          'media query for type extension is properly shimmed');        
+          'media query for type extension is properly shimmed');
 
         done();
       });
     });
   </script>
-  
-  
+
+
 </body>
 </html>
diff --git a/tests/ShadowCSS/html/pseudo-scoping.html b/tests/ShadowCSS/html/pseudo-scoping.html
index a47c8a3..3561b87 100644
--- a/tests/ShadowCSS/html/pseudo-scoping.html
+++ b/tests/ShadowCSS/html/pseudo-scoping.html
@@ -1,11 +1,12 @@
-<!DOCTYPE html>
+<!doctype html>
 <!--
-Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 <html>
 <head>
@@ -40,7 +41,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
         background: green;
       }
 
-      div::before { 
+      div::before {
         background: blue;
         content: 'zonk';
       }
@@ -49,7 +50,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
         div {
           font-size: 50px;
         }
-      } 
+      }
     </style>
     <div>20px / 50px</div>
   </template>
@@ -72,7 +73,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
   <script>
     register('x-foo', '', HTMLElement.prototype);
     register('x-button', 'button', HTMLButtonElement.prototype, ['x-button']);
-    
+
     document.addEventListener('WebComponentsReady', function() {
       setTimeout(function() {
         var foo = document.querySelector('x-foo');
@@ -88,15 +89,15 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
             .shadowRoot.querySelector('div');
         var xButtonDivStyle = getComputedStyle(xButtonDiv);
         chai.assert.equal(xButtonDivStyle.backgroundColor, 'rgb(255, 0, 0)',
-          'type extension is properly shimmed');        
+          'type extension is properly shimmed');
         chai.assert.equal(xButtonDivStyle.fontSize, '50px',
-          'media query for type extension is properly shimmed');        
+          'media query for type extension is properly shimmed');
 
         done();
       });
     });
   </script>
-  
-  
+
+
 </body>
 </html>
diff --git a/tests/ShadowCSS/html/register.js b/tests/ShadowCSS/html/register.js
index 1f7b21e..a122ad8 100644
--- a/tests/ShadowCSS/html/register.js
+++ b/tests/ShadowCSS/html/register.js
@@ -1,4 +1,5 @@
-/*
+/**
+ * @license
  * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
  * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
  * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
@@ -52,13 +53,13 @@
   function templateForName(name) {
     return document.querySelector('#' + name);
   }
-  
+
   function shim(templates, names) {
     var n = names[names.length-1];
     var template = templateForName(n);
     WebComponents.ShadowCSS.shimStyling(template ? template.content : null, n, extendsRegistry[n]);
   }
-  
+
   scope.register = register;
 
 })(window);
diff --git a/tests/ShadowCSS/html/style-import.html b/tests/ShadowCSS/html/style-import.html
index 87a92db..f97e8f1 100644
--- a/tests/ShadowCSS/html/style-import.html
+++ b/tests/ShadowCSS/html/style-import.html
@@ -1,11 +1,12 @@
 <!doctype html>
 <!--
-Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 <html>
   <head>
diff --git a/tests/ShadowCSS/runner.html b/tests/ShadowCSS/runner.html
index 6a9a669..835fd86 100644
--- a/tests/ShadowCSS/runner.html
+++ b/tests/ShadowCSS/runner.html
@@ -1,8 +1,12 @@
-<!DOCTYPE html>
+<!doctype html>
 <!--
-Copyright 2013 The Polymer Authors. All rights reserved.
-Use of this source code is governed by a BSD-style
-license that can be found in the LICENSE file.
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 <title>ShadowCSS Tests</title>
 <meta charset="utf-8">
diff --git a/tests/ShadowCSS/tests.js b/tests/ShadowCSS/tests.js
index b74f8c0..d3435ba 100644
--- a/tests/ShadowCSS/tests.js
+++ b/tests/ShadowCSS/tests.js
@@ -1,4 +1,5 @@
-/*
+/**
+ * @license
  * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
  * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
  * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
diff --git a/tests/ShadowDOM/html/document-body-inner-html.html b/tests/ShadowDOM/html/document-body-inner-html.html
index 3ffd0af..5f9b510 100644
--- a/tests/ShadowDOM/html/document-body-inner-html.html
+++ b/tests/ShadowDOM/html/document-body-inner-html.html
@@ -1,3 +1,4 @@
+<!doctype html>
 <!--
     @license
     Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
@@ -7,7 +8,6 @@
     Code distributed by Google as part of the polymer project is also
     subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
-<!DOCTYPE html>
 <script src="../../tools/chai/chai.js"></script>
 <script src="../../tools/htmltest.js"></script>
 
diff --git a/tests/ShadowDOM/html/document-body-shadow-root.html b/tests/ShadowDOM/html/document-body-shadow-root.html
index 0473ce9..8033278 100644
--- a/tests/ShadowDOM/html/document-body-shadow-root.html
+++ b/tests/ShadowDOM/html/document-body-shadow-root.html
@@ -1,4 +1,13 @@
-<!DOCTYPE html>
+<!doctype html>
+<!--
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+-->
 <script src="../../tools/chai/chai.js"></script>
 <script src="../../tools/htmltest.js"></script>
 
diff --git a/tests/ShadowDOM/html/document-write.html b/tests/ShadowDOM/html/document-write.html
index dc138b8..19189db 100644
--- a/tests/ShadowDOM/html/document-write.html
+++ b/tests/ShadowDOM/html/document-write.html
@@ -1,3 +1,4 @@
+<!doctype html>
 <!--
     @license
     Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
@@ -7,7 +8,6 @@
     Code distributed by Google as part of the polymer project is also
     subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
-<!DOCTYPE html>
 <script src="../../tools/chai/chai.js"></script>
 <script src="../../tools/htmltest.js"></script>
 
diff --git a/tests/ShadowDOM/html/head-then-body.html b/tests/ShadowDOM/html/head-then-body.html
index cce34d1..fb7287c 100644
--- a/tests/ShadowDOM/html/head-then-body.html
+++ b/tests/ShadowDOM/html/head-then-body.html
@@ -1,3 +1,4 @@
+<!doctype html>
 <!--
     @license
     Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
@@ -7,7 +8,6 @@
     Code distributed by Google as part of the polymer project is also
     subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
-<!DOCTYPE html>
 <script src="../../tools/chai/chai.js"></script>
 <script src="../../tools/htmltest.js"></script>
 
diff --git a/tests/ShadowDOM/html/on-load-test.html b/tests/ShadowDOM/html/on-load-test.html
index 4411083..837ddaa 100644
--- a/tests/ShadowDOM/html/on-load-test.html
+++ b/tests/ShadowDOM/html/on-load-test.html
@@ -1,3 +1,4 @@
+<!doctype html>
 <!--
     @license
     Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
@@ -7,7 +8,6 @@
     Code distributed by Google as part of the polymer project is also
     subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
-<!DOCTYPE html>
 <script src="../../tools/chai/chai.js"></script>
 <script src="../../tools/htmltest.js"></script>
 
diff --git a/tests/ShadowDOM/html/on-unload-test.html b/tests/ShadowDOM/html/on-unload-test.html
index 49cae4c..d1b5dc7 100644
--- a/tests/ShadowDOM/html/on-unload-test.html
+++ b/tests/ShadowDOM/html/on-unload-test.html
@@ -1,4 +1,13 @@
-<!DOCTYPE html>
+<!doctype html>
+<!--
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+-->
 <script src="../../tools/chai/chai.js"></script>
 <script src="../../tools/htmltest.js"></script>
 
diff --git a/tests/ShadowDOM/js/ChildNodeInterface.js b/tests/ShadowDOM/js/ChildNodeInterface.js
index 274f922..1fac5b6 100644
--- a/tests/ShadowDOM/js/ChildNodeInterface.js
+++ b/tests/ShadowDOM/js/ChildNodeInterface.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('ChildNodeInterface', function() {
diff --git a/tests/ShadowDOM/js/Comment.js b/tests/ShadowDOM/js/Comment.js
index f63c6b1..faccb81 100644
--- a/tests/ShadowDOM/js/Comment.js
+++ b/tests/ShadowDOM/js/Comment.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('Comment', function() {
diff --git a/tests/ShadowDOM/js/DOMTokenList.js b/tests/ShadowDOM/js/DOMTokenList.js
index 0ee2262..68152c9 100644
--- a/tests/ShadowDOM/js/DOMTokenList.js
+++ b/tests/ShadowDOM/js/DOMTokenList.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2014 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('DOMTokenList', function() {
diff --git a/tests/ShadowDOM/js/Document.js b/tests/ShadowDOM/js/Document.js
index 7e44fbb..0dcbfe4 100644
--- a/tests/ShadowDOM/js/Document.js
+++ b/tests/ShadowDOM/js/Document.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 htmlSuite('Document', function() {
diff --git a/tests/ShadowDOM/js/Element.js b/tests/ShadowDOM/js/Element.js
index 01af583..a7b4a21 100644
--- a/tests/ShadowDOM/js/Element.js
+++ b/tests/ShadowDOM/js/Element.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('Element', function() {
diff --git a/tests/ShadowDOM/js/FormData.js b/tests/ShadowDOM/js/FormData.js
index b9be8f9..f4b0677 100644
--- a/tests/ShadowDOM/js/FormData.js
+++ b/tests/ShadowDOM/js/FormData.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2014 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('FormData', function() {
diff --git a/tests/ShadowDOM/js/HTMLAudioElement.js b/tests/ShadowDOM/js/HTMLAudioElement.js
index f35cb4e..5ff676a 100644
--- a/tests/ShadowDOM/js/HTMLAudioElement.js
+++ b/tests/ShadowDOM/js/HTMLAudioElement.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('HTMLAudioElement', function() {
diff --git a/tests/ShadowDOM/js/HTMLBodyElement.js b/tests/ShadowDOM/js/HTMLBodyElement.js
index a8d4b49..08b8dcc 100644
--- a/tests/ShadowDOM/js/HTMLBodyElement.js
+++ b/tests/ShadowDOM/js/HTMLBodyElement.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 htmlSuite('HTMLBodyElement', function() {
diff --git a/tests/ShadowDOM/js/HTMLButtonElement.js b/tests/ShadowDOM/js/HTMLButtonElement.js
index 8988a0f..f09525c 100644
--- a/tests/ShadowDOM/js/HTMLButtonElement.js
+++ b/tests/ShadowDOM/js/HTMLButtonElement.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('HTMLButtonElement', function() {
diff --git a/tests/ShadowDOM/js/HTMLCanvasElement.js b/tests/ShadowDOM/js/HTMLCanvasElement.js
index b6ae9db..d8de9d5 100644
--- a/tests/ShadowDOM/js/HTMLCanvasElement.js
+++ b/tests/ShadowDOM/js/HTMLCanvasElement.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('HTMLCanvasElement', function() {
diff --git a/tests/ShadowDOM/js/HTMLContentElement.js b/tests/ShadowDOM/js/HTMLContentElement.js
index 25b944c..ba0734e 100644
--- a/tests/ShadowDOM/js/HTMLContentElement.js
+++ b/tests/ShadowDOM/js/HTMLContentElement.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2012 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('HTMLContentElement', function() {
@@ -52,7 +56,8 @@ suite('HTMLContentElement', function() {
     df.appendChild(document.createTextNode(' '));
     root.appendChild(df);
 
-    assertArrayEqual(content.getDistributedNodes().length, 3);
+    assert.equal(content.getDistributedNodes().length, 7);
+    assertArrayEqual(content.getDistributedNodes(), host.childNodes);
   });
 
   test('getDistributedNodes add content deep inside tree', function() {
@@ -237,4 +242,4 @@ suite('HTMLContentElement', function() {
     assert.equal(HTMLContentElement,
                  document.createElement('content').constructor);
   });
-});
\ No newline at end of file
+});
diff --git a/tests/ShadowDOM/js/HTMLElement.js b/tests/ShadowDOM/js/HTMLElement.js
index e8c2859..f6d30a3 100644
--- a/tests/ShadowDOM/js/HTMLElement.js
+++ b/tests/ShadowDOM/js/HTMLElement.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('HTMLElement', function() {
diff --git a/tests/ShadowDOM/js/HTMLFieldSetElement.js b/tests/ShadowDOM/js/HTMLFieldSetElement.js
index 4cefe75..522a833 100644
--- a/tests/ShadowDOM/js/HTMLFieldSetElement.js
+++ b/tests/ShadowDOM/js/HTMLFieldSetElement.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('HTMLFieldSetElement', function() {
diff --git a/tests/ShadowDOM/js/HTMLFormElement.js b/tests/ShadowDOM/js/HTMLFormElement.js
index cfb58ce..0a08aff 100644
--- a/tests/ShadowDOM/js/HTMLFormElement.js
+++ b/tests/ShadowDOM/js/HTMLFormElement.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2014 The Polymer Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('HTMLFormElement', function() {
diff --git a/tests/ShadowDOM/js/HTMLHeadElement.js b/tests/ShadowDOM/js/HTMLHeadElement.js
index ebf0202..cfa8866 100644
--- a/tests/ShadowDOM/js/HTMLHeadElement.js
+++ b/tests/ShadowDOM/js/HTMLHeadElement.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('HTMLHeadElement', function() {
diff --git a/tests/ShadowDOM/js/HTMLHtmlElement.js b/tests/ShadowDOM/js/HTMLHtmlElement.js
index 023f46e..be2e8a6 100644
--- a/tests/ShadowDOM/js/HTMLHtmlElement.js
+++ b/tests/ShadowDOM/js/HTMLHtmlElement.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('HTMLHtmlElement', function() {
diff --git a/tests/ShadowDOM/js/HTMLImageElement.js b/tests/ShadowDOM/js/HTMLImageElement.js
index adac85b..08bb725 100644
--- a/tests/ShadowDOM/js/HTMLImageElement.js
+++ b/tests/ShadowDOM/js/HTMLImageElement.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('HTMLImageElement', function() {
diff --git a/tests/ShadowDOM/js/HTMLInputElement.js b/tests/ShadowDOM/js/HTMLInputElement.js
index 8eb1b9e..6d0317d 100644
--- a/tests/ShadowDOM/js/HTMLInputElement.js
+++ b/tests/ShadowDOM/js/HTMLInputElement.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('HTMLInputElement', function() {
diff --git a/tests/ShadowDOM/js/HTMLKeygenElement.js b/tests/ShadowDOM/js/HTMLKeygenElement.js
index 5b34059..f71a380 100644
--- a/tests/ShadowDOM/js/HTMLKeygenElement.js
+++ b/tests/ShadowDOM/js/HTMLKeygenElement.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('HTMLKeygenElement', function() {
diff --git a/tests/ShadowDOM/js/HTMLLabelElement.js b/tests/ShadowDOM/js/HTMLLabelElement.js
index b55155e..04570ab 100644
--- a/tests/ShadowDOM/js/HTMLLabelElement.js
+++ b/tests/ShadowDOM/js/HTMLLabelElement.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('HTMLLabelElement', function() {
diff --git a/tests/ShadowDOM/js/HTMLLegendElement.js b/tests/ShadowDOM/js/HTMLLegendElement.js
index 804a40b..76f215f 100644
--- a/tests/ShadowDOM/js/HTMLLegendElement.js
+++ b/tests/ShadowDOM/js/HTMLLegendElement.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('HTMLLegendElement', function() {
diff --git a/tests/ShadowDOM/js/HTMLObjectElement.js b/tests/ShadowDOM/js/HTMLObjectElement.js
index f774554..9c6b75f 100644
--- a/tests/ShadowDOM/js/HTMLObjectElement.js
+++ b/tests/ShadowDOM/js/HTMLObjectElement.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('HTMLObjectElement', function() {
diff --git a/tests/ShadowDOM/js/HTMLOptionElement.js b/tests/ShadowDOM/js/HTMLOptionElement.js
index 66acf89..ee11c6b 100644
--- a/tests/ShadowDOM/js/HTMLOptionElement.js
+++ b/tests/ShadowDOM/js/HTMLOptionElement.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('HTMLOptionElement', function() {
diff --git a/tests/ShadowDOM/js/HTMLOutputElement.js b/tests/ShadowDOM/js/HTMLOutputElement.js
index fec297d..6a77412 100644
--- a/tests/ShadowDOM/js/HTMLOutputElement.js
+++ b/tests/ShadowDOM/js/HTMLOutputElement.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('HTMLOutputElement', function() {
diff --git a/tests/ShadowDOM/js/HTMLSelectElement.js b/tests/ShadowDOM/js/HTMLSelectElement.js
index 0ffaa94..b13f960 100644
--- a/tests/ShadowDOM/js/HTMLSelectElement.js
+++ b/tests/ShadowDOM/js/HTMLSelectElement.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('HTMLSelectElement', function() {
diff --git a/tests/ShadowDOM/js/HTMLShadowElement.js b/tests/ShadowDOM/js/HTMLShadowElement.js
index 83c56e7..71c2398 100644
--- a/tests/ShadowDOM/js/HTMLShadowElement.js
+++ b/tests/ShadowDOM/js/HTMLShadowElement.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('HTMLShadowElement', function() {
diff --git a/tests/ShadowDOM/js/HTMLTableElement.js b/tests/ShadowDOM/js/HTMLTableElement.js
index 8acb306..943cb93 100644
--- a/tests/ShadowDOM/js/HTMLTableElement.js
+++ b/tests/ShadowDOM/js/HTMLTableElement.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2014 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('HTMLTableElement', function() {
diff --git a/tests/ShadowDOM/js/HTMLTableRowElement.js b/tests/ShadowDOM/js/HTMLTableRowElement.js
index a07d326..333c8d3 100644
--- a/tests/ShadowDOM/js/HTMLTableRowElement.js
+++ b/tests/ShadowDOM/js/HTMLTableRowElement.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2014 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('HTMLTableRowElement', function() {
diff --git a/tests/ShadowDOM/js/HTMLTableSectionElement.js b/tests/ShadowDOM/js/HTMLTableSectionElement.js
index 3c56265..3ffe537 100644
--- a/tests/ShadowDOM/js/HTMLTableSectionElement.js
+++ b/tests/ShadowDOM/js/HTMLTableSectionElement.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2014 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('HTMLTableSectionElement', function() {
diff --git a/tests/ShadowDOM/js/HTMLTemplateElement.js b/tests/ShadowDOM/js/HTMLTemplateElement.js
index 82a4a43..b31bce7 100644
--- a/tests/ShadowDOM/js/HTMLTemplateElement.js
+++ b/tests/ShadowDOM/js/HTMLTemplateElement.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('HTML Template Element', function() {
@@ -153,4 +157,4 @@ suite('HTML Template Element', function() {
         document.createElement('template').constructor);
   });
 
-});
\ No newline at end of file
+});
diff --git a/tests/ShadowDOM/js/HTMLTextAreaElement.js b/tests/ShadowDOM/js/HTMLTextAreaElement.js
index 9063e80..c37fb49 100644
--- a/tests/ShadowDOM/js/HTMLTextAreaElement.js
+++ b/tests/ShadowDOM/js/HTMLTextAreaElement.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('HTMLTextAreaElement', function() {
diff --git a/tests/ShadowDOM/js/MutationObserver.js b/tests/ShadowDOM/js/MutationObserver.js
index 8dc3edf..5609bdd 100644
--- a/tests/ShadowDOM/js/MutationObserver.js
+++ b/tests/ShadowDOM/js/MutationObserver.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('MutationObserver', function() {
diff --git a/tests/ShadowDOM/js/MutationObserver/attributes.js b/tests/ShadowDOM/js/MutationObserver/attributes.js
index 0bc5ae8..426e646 100644
--- a/tests/ShadowDOM/js/MutationObserver/attributes.js
+++ b/tests/ShadowDOM/js/MutationObserver/attributes.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2012 The Polymer Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('MutationObserver', function() {
@@ -277,4 +281,4 @@ suite('MutationObserver', function() {
 
   });
 
-});
\ No newline at end of file
+});
diff --git a/tests/ShadowDOM/js/MutationObserver/callback.js b/tests/ShadowDOM/js/MutationObserver/callback.js
index 7f84844..6c25621 100644
--- a/tests/ShadowDOM/js/MutationObserver/callback.js
+++ b/tests/ShadowDOM/js/MutationObserver/callback.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2012 The Polymer Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('MutationObserver', function() {
@@ -73,4 +77,4 @@ suite('MutationObserver', function() {
 
   });
 
-});
\ No newline at end of file
+});
diff --git a/tests/ShadowDOM/js/MutationObserver/characterData.js b/tests/ShadowDOM/js/MutationObserver/characterData.js
index cc462b2..317c1e6 100644
--- a/tests/ShadowDOM/js/MutationObserver/characterData.js
+++ b/tests/ShadowDOM/js/MutationObserver/characterData.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2012 The Polymer Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('MutationObserver', function() {
@@ -97,4 +101,4 @@ suite('MutationObserver', function() {
 
   });
 
-});
\ No newline at end of file
+});
diff --git a/tests/ShadowDOM/js/MutationObserver/childList.js b/tests/ShadowDOM/js/MutationObserver/childList.js
index fe54c68..13e69aa 100644
--- a/tests/ShadowDOM/js/MutationObserver/childList.js
+++ b/tests/ShadowDOM/js/MutationObserver/childList.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('MutationObserver', function() {
diff --git a/tests/ShadowDOM/js/MutationObserver/mixed.js b/tests/ShadowDOM/js/MutationObserver/mixed.js
index afc75a9..830c0d2 100644
--- a/tests/ShadowDOM/js/MutationObserver/mixed.js
+++ b/tests/ShadowDOM/js/MutationObserver/mixed.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2012 The Polymer Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('MutationObserver', function() {
@@ -37,4 +41,4 @@ suite('MutationObserver', function() {
 
   });
 
-});
\ No newline at end of file
+});
diff --git a/tests/ShadowDOM/js/MutationObserver/options.js b/tests/ShadowDOM/js/MutationObserver/options.js
index bea4c5d..be26821 100644
--- a/tests/ShadowDOM/js/MutationObserver/options.js
+++ b/tests/ShadowDOM/js/MutationObserver/options.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2012 The Polymer Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('MutationObserver', function() {
@@ -107,4 +111,4 @@ suite('MutationObserver', function() {
 
   });
 
-});
\ No newline at end of file
+});
diff --git a/tests/ShadowDOM/js/MutationObserver/shadow-root.js b/tests/ShadowDOM/js/MutationObserver/shadow-root.js
index 0fc68c1..33e32f3 100644
--- a/tests/ShadowDOM/js/MutationObserver/shadow-root.js
+++ b/tests/ShadowDOM/js/MutationObserver/shadow-root.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('MutationObserver', function() {
@@ -102,4 +106,4 @@ suite('MutationObserver', function() {
 
   });
 
-});
\ No newline at end of file
+});
diff --git a/tests/ShadowDOM/js/MutationObserver/transient.js b/tests/ShadowDOM/js/MutationObserver/transient.js
index ffc718a..af3198d 100644
--- a/tests/ShadowDOM/js/MutationObserver/transient.js
+++ b/tests/ShadowDOM/js/MutationObserver/transient.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2012 The Polymer Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('MutationObserver', function() {
@@ -303,4 +307,4 @@ suite('MutationObserver', function() {
 
   });
 
-});
\ No newline at end of file
+});
diff --git a/tests/ShadowDOM/js/Node.js b/tests/ShadowDOM/js/Node.js
index 8a8e9c6..a0b9dbe 100644
--- a/tests/ShadowDOM/js/Node.js
+++ b/tests/ShadowDOM/js/Node.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('Node', function() {
diff --git a/tests/ShadowDOM/js/ParentNodeInterface.js b/tests/ShadowDOM/js/ParentNodeInterface.js
index 35ac61c..72b3d6c 100644
--- a/tests/ShadowDOM/js/ParentNodeInterface.js
+++ b/tests/ShadowDOM/js/ParentNodeInterface.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('ParentNodeInterface', function() {
diff --git a/tests/ShadowDOM/js/Range.js b/tests/ShadowDOM/js/Range.js
index 80c3779..c180ffa 100644
--- a/tests/ShadowDOM/js/Range.js
+++ b/tests/ShadowDOM/js/Range.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('Range', function() {
diff --git a/tests/ShadowDOM/js/SVGElement.js b/tests/ShadowDOM/js/SVGElement.js
index fb1dd46..3c889f4 100644
--- a/tests/ShadowDOM/js/SVGElement.js
+++ b/tests/ShadowDOM/js/SVGElement.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2014 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('SVGElement', function() {
diff --git a/tests/ShadowDOM/js/SVGElementInstance.js b/tests/ShadowDOM/js/SVGElementInstance.js
index 4d2f666..9f3aa44 100644
--- a/tests/ShadowDOM/js/SVGElementInstance.js
+++ b/tests/ShadowDOM/js/SVGElementInstance.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2014 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('SVGElementInstance', function() {
diff --git a/tests/ShadowDOM/js/Selection.js b/tests/ShadowDOM/js/Selection.js
index 1b29b7e..8ac191e 100644
--- a/tests/ShadowDOM/js/Selection.js
+++ b/tests/ShadowDOM/js/Selection.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2014 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('Selection', function() {
diff --git a/tests/ShadowDOM/js/ShadowRoot.js b/tests/ShadowDOM/js/ShadowRoot.js
index ce28ef6..62478fd 100644
--- a/tests/ShadowDOM/js/ShadowRoot.js
+++ b/tests/ShadowDOM/js/ShadowRoot.js
@@ -1,6 +1,12 @@
-// Copyright 2013 The Polymer Authors. All rights reserved.
-// Use of this source code is goverened by a BSD-style
-// license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+ */
 
 suite('ShadowRoot', function() {
 
diff --git a/tests/ShadowDOM/js/Text.js b/tests/ShadowDOM/js/Text.js
index b97eea2..b8a0b44 100644
--- a/tests/ShadowDOM/js/Text.js
+++ b/tests/ShadowDOM/js/Text.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('Text', function() {
diff --git a/tests/ShadowDOM/js/TouchEvent.js b/tests/ShadowDOM/js/TouchEvent.js
index 795fddb..9e9e246 100644
--- a/tests/ShadowDOM/js/TouchEvent.js
+++ b/tests/ShadowDOM/js/TouchEvent.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2014 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 htmlSuite('Events', function() {
diff --git a/tests/ShadowDOM/js/TreeScope.js b/tests/ShadowDOM/js/TreeScope.js
index b6025e0..b903f19 100644
--- a/tests/ShadowDOM/js/TreeScope.js
+++ b/tests/ShadowDOM/js/TreeScope.js
@@ -1,7 +1,11 @@
 /**
- * Copyright 2014 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('TreeScope', function() {
diff --git a/tests/ShadowDOM/js/Window.js b/tests/ShadowDOM/js/Window.js
index 67853e5..c939095 100644
--- a/tests/ShadowDOM/js/Window.js
+++ b/tests/ShadowDOM/js/Window.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('Window', function() {
diff --git a/tests/ShadowDOM/js/XMLHttpRequest.js b/tests/ShadowDOM/js/XMLHttpRequest.js
index 7ade23c..b9697ca 100644
--- a/tests/ShadowDOM/js/XMLHttpRequest.js
+++ b/tests/ShadowDOM/js/XMLHttpRequest.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2014 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('XMLHttpRequest', function() {
diff --git a/tests/ShadowDOM/js/build-json.js b/tests/ShadowDOM/js/build-json.js
index 7632085..e848234 100644
--- a/tests/ShadowDOM/js/build-json.js
+++ b/tests/ShadowDOM/js/build-json.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2014 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('build.json', function() {
diff --git a/tests/ShadowDOM/js/createTable.js b/tests/ShadowDOM/js/createTable.js
index e3d59b4..67ae68e 100644
--- a/tests/ShadowDOM/js/createTable.js
+++ b/tests/ShadowDOM/js/createTable.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2014 The Polymer Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 function createTable() {
diff --git a/tests/ShadowDOM/js/custom-element.js b/tests/ShadowDOM/js/custom-element.js
index 210ccad..fc5bdcd 100644
--- a/tests/ShadowDOM/js/custom-element.js
+++ b/tests/ShadowDOM/js/custom-element.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('Custom Element', function() {
@@ -27,4 +31,4 @@ suite('Custom Element', function() {
                   'plain custom element has custom function');
   });
 
-});
\ No newline at end of file
+});
diff --git a/tests/ShadowDOM/js/events.js b/tests/ShadowDOM/js/events.js
index 0fb55c6..df0ec7c 100644
--- a/tests/ShadowDOM/js/events.js
+++ b/tests/ShadowDOM/js/events.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 htmlSuite('Events', function() {
diff --git a/tests/ShadowDOM/js/microtask.js b/tests/ShadowDOM/js/microtask.js
index 179057b..c09a536 100644
--- a/tests/ShadowDOM/js/microtask.js
+++ b/tests/ShadowDOM/js/microtask.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('Microtask', function() {
diff --git a/tests/ShadowDOM/js/paralleltrees.js b/tests/ShadowDOM/js/paralleltrees.js
index 10a1561..a9c6971 100644
--- a/tests/ShadowDOM/js/paralleltrees.js
+++ b/tests/ShadowDOM/js/paralleltrees.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2012 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('Parallel Trees', function() {
@@ -1330,4 +1334,4 @@ suite('Parallel Trees', function() {
     assert.equal(div.firstChild.tagName, 'B');
   });
 
-});
\ No newline at end of file
+});
diff --git a/tests/ShadowDOM/js/reprojection.js b/tests/ShadowDOM/js/reprojection.js
index 85b38b1..4d01aa1 100644
--- a/tests/ShadowDOM/js/reprojection.js
+++ b/tests/ShadowDOM/js/reprojection.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2012 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('Shadow DOM reprojection', function() {
diff --git a/tests/ShadowDOM/js/rerender.js b/tests/ShadowDOM/js/rerender.js
index 6b13a7e..cb350ae 100644
--- a/tests/ShadowDOM/js/rerender.js
+++ b/tests/ShadowDOM/js/rerender.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2012 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('Shadow DOM rerender', function() {
@@ -642,4 +646,4 @@ suite('Shadow DOM rerender', function() {
       ShadowDOMPolyfill.originalRemoveChild = originalRemoveChild;
     }
   });
-});
\ No newline at end of file
+});
diff --git a/tests/ShadowDOM/js/test.js b/tests/ShadowDOM/js/test.js
index 18244b8..c1cc475 100644
--- a/tests/ShadowDOM/js/test.js
+++ b/tests/ShadowDOM/js/test.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2012 The Polymer Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('Shadow DOM', function() {
diff --git a/tests/ShadowDOM/js/wrappers.js b/tests/ShadowDOM/js/wrappers.js
index ca7f47a..0b1307e 100644
--- a/tests/ShadowDOM/js/wrappers.js
+++ b/tests/ShadowDOM/js/wrappers.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is goverened by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 suite('Wrapper creation', function() {
diff --git a/tests/ShadowDOM/manual/before-unload.html b/tests/ShadowDOM/manual/before-unload.html
index be594d4..8fc25bc 100644
--- a/tests/ShadowDOM/manual/before-unload.html
+++ b/tests/ShadowDOM/manual/before-unload.html
@@ -1,3 +1,4 @@
+<!doctype html>
 <!--
     @license
     Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
@@ -7,7 +8,6 @@
     Code distributed by Google as part of the polymer project is also
     subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
-<!doctype html>
 <script src="../../../src/ShadowDOM/ShadowDOM.js"></script>
 <script>
 
diff --git a/tests/ShadowDOM/manual/setDragImage.html b/tests/ShadowDOM/manual/setDragImage.html
index 85f21bd..31436a3 100644
--- a/tests/ShadowDOM/manual/setDragImage.html
+++ b/tests/ShadowDOM/manual/setDragImage.html
@@ -1,3 +1,4 @@
+<!doctype html>
 <!--
     @license
     Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
@@ -7,7 +8,6 @@
     Code distributed by Google as part of the polymer project is also
     subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
-<!doctype html>
 <script src="../../../src/ShadowDOM/ShadowDOM.js"></script>
 
 <p>Drag the div below the image. When dragging the image should be used as the
diff --git a/tests/ShadowDOM/runner.html b/tests/ShadowDOM/runner.html
index c0c3012..71f7a20 100644
--- a/tests/ShadowDOM/runner.html
+++ b/tests/ShadowDOM/runner.html
@@ -1,8 +1,12 @@
-<!DOCTYPE html>
+<!doctype html>
 <!--
-Copyright 2012 The Polymer Authors. All rights reserved.
-Use of this source code is governed by a BSD-style
-license that can be found in the LICENSE file.
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 <title>ShadowDOM Tests</title>
 <meta charset="utf-8">
diff --git a/tests/ShadowDOM/runner.min.html b/tests/ShadowDOM/runner.min.html
index c930518..8f0571e 100644
--- a/tests/ShadowDOM/runner.min.html
+++ b/tests/ShadowDOM/runner.min.html
@@ -1,8 +1,12 @@
-<!DOCTYPE html>
+<!doctype html>
 <!--
-Copyright 2012 The Polymer Authors. All rights reserved.
-Use of this source code is governed by a BSD-style
-license that can be found in the LICENSE file.
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 <meta charset="utf-8">
 <link rel="stylesheet" href="../../tools/test/mocha/mocha.css">
diff --git a/tests/ShadowDOM/tests.js b/tests/ShadowDOM/tests.js
index 1fa13f4..9e0fd59 100644
--- a/tests/ShadowDOM/tests.js
+++ b/tests/ShadowDOM/tests.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 var assert = chai.assert;
diff --git a/tests/Template/html/Template.html b/tests/Template/html/Template.html
new file mode 100644
index 0000000..31f5749
--- /dev/null
+++ b/tests/Template/html/Template.html
@@ -0,0 +1,38 @@
+<!doctype html>
+<!--
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+-->
+<html>
+  <head>
+    <title>Template Test</title>
+    <script src="../../tools/htmltest.js"></script>
+    <script src="../../tools/chai/chai.js"></script>
+    <script src="../../../src/Template/Template.js"></script>
+  </head>
+  <body>
+    <template>
+      <span id="content">Hello World!</span>
+    </template>
+
+    <script>
+      addEventListener('DOMContentLoaded', function() {
+        var template = document.querySelector('template');
+        chai.assert.equal(template.childNodes.length, 0, 'template children evacipated');
+        chai.assert.isDefined(template.content, 'template content exists');
+        chai.assert.equal(template.content.childNodes.length, 3, 'template content has expected number of nodes');
+        var content = document.querySelector('#content');
+        chai.assert.isNull(content, 'template content not in document');
+        document.body.appendChild(document.importNode(template.content, true));
+        content = document.querySelector('#content');
+        chai.assert.isDefined(content, 'template content stamped into document');
+        done();
+      });
+    </script>
+  </body>
+</html>
diff --git a/tests/Template/runner.html b/tests/Template/runner.html
new file mode 100644
index 0000000..3bd02d7
--- /dev/null
+++ b/tests/Template/runner.html
@@ -0,0 +1,32 @@
+<!doctype html>
+<!--
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+-->
+<title>HTMLImports Tests</title>
+<meta charset="utf-8">
+
+<!-- Mocha/Chai -->
+<link rel="stylesheet" href="../tools/mocha/mocha.css">
+<script src="../tools/mocha/mocha.js"></script>
+<script src="../tools/chai/chai.js"></script>
+<script src="../tools/mocha-htmltest.js"></script>
+
+<!-- HTMLImports -->
+<script src="../../src/Template/Template.js"></script>
+
+<div id="mocha"></div>
+<script>
+  mocha.setup({ui: 'tdd', slow: 1000});
+</script>
+
+<script src="tests.js"></script>
+
+<script>
+  mocha.run();
+</script>
diff --git a/tests/Template/tests.js b/tests/Template/tests.js
new file mode 100644
index 0000000..f681af9
--- /dev/null
+++ b/tests/Template/tests.js
@@ -0,0 +1,16 @@
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+ */
+(function() {
+
+htmlSuite('Template', function() {
+  htmlTest('html/Template.html');
+});
+
+})();
diff --git a/tests/WeakMap/runner.html b/tests/WeakMap/runner.html
index 0f04d6f..07af152 100644
--- a/tests/WeakMap/runner.html
+++ b/tests/WeakMap/runner.html
@@ -1,8 +1,12 @@
-<!DOCTYPE html>
+<!doctype html>
 <!--
-Copyright 2013 The Polymer Authors. All rights reserved.
-Use of this source code is governed by a BSD-style
-license that can be found in the LICENSE file.
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 <title>WeakMap tests</title>
 <meta charset="utf-8">
diff --git a/tests/WebComponents/html/ce-import.html b/tests/WebComponents/html/ce-import.html
index 2a39092..ab566f0 100644
--- a/tests/WebComponents/html/ce-import.html
+++ b/tests/WebComponents/html/ce-import.html
@@ -1,11 +1,12 @@
-<!DOCTYPE html>
+<!doctype html>
 <!--
-Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 <html>
   <head>
diff --git a/tests/WebComponents/html/ce-upgrade-order.html b/tests/WebComponents/html/ce-upgrade-order.html
index e58fce0..17aefc9 100644
--- a/tests/WebComponents/html/ce-upgrade-order.html
+++ b/tests/WebComponents/html/ce-upgrade-order.html
@@ -1,12 +1,13 @@
+<!doctype html>
 <!--
-Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
-<!DOCTYPE html>
 <html lang="en">
 <head>
   <meta charset="UTF-8">
diff --git a/tests/WebComponents/html/ce-upgradedocumenttree.html b/tests/WebComponents/html/ce-upgradedocumenttree.html
index 4701abc..b6091d7 100644
--- a/tests/WebComponents/html/ce-upgradedocumenttree.html
+++ b/tests/WebComponents/html/ce-upgradedocumenttree.html
@@ -1,11 +1,12 @@
-<!DOCTYPE html>
+<!doctype html>
 <!--
-Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 <html>
   <head>
@@ -30,7 +31,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
       }
 
       if (CustomElements.useNative || HTMLImports.useNative) {
-        done(); 
+        done();
       } else {
         window.addEventListener('WebComponentsReady', function() {
           CustomElements.ready = false;
diff --git a/tests/WebComponents/html/dev-loader-swizzled.html b/tests/WebComponents/html/dev-loader-swizzled.html
index a65a15d..87f5c89 100644
--- a/tests/WebComponents/html/dev-loader-swizzled.html
+++ b/tests/WebComponents/html/dev-loader-swizzled.html
@@ -1,11 +1,12 @@
-<!DOCTYPE html>
+<!doctype html>
 <!--
-Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 <html>
   <head>
diff --git a/tests/WebComponents/html/dev-loader.html b/tests/WebComponents/html/dev-loader.html
index 1b548f2..f51d030 100644
--- a/tests/WebComponents/html/dev-loader.html
+++ b/tests/WebComponents/html/dev-loader.html
@@ -1,11 +1,12 @@
-<!DOCTYPE html>
+<!doctype html>
 <!--
-Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 <html>
   <head>
diff --git a/tests/WebComponents/html/element-import-a.html b/tests/WebComponents/html/element-import-a.html
index 539fd2b..a3d5ee5 100644
--- a/tests/WebComponents/html/element-import-a.html
+++ b/tests/WebComponents/html/element-import-a.html
@@ -1,10 +1,11 @@
 <!--
-Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 <x-test></x-test>
-<link rel="import" href="element-import-b.html">
\ No newline at end of file
+<link rel="import" href="element-import-b.html">
diff --git a/tests/WebComponents/html/element-import-b.html b/tests/WebComponents/html/element-import-b.html
index 151696a..d34c444 100644
--- a/tests/WebComponents/html/element-import-b.html
+++ b/tests/WebComponents/html/element-import-b.html
@@ -1,10 +1,11 @@
 <!--
-Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 <x-test></x-test>
-<link rel="import" href="element-import-a.html">
\ No newline at end of file
+<link rel="import" href="element-import-a.html">
diff --git a/tests/WebComponents/html/element-import.html b/tests/WebComponents/html/element-import.html
index fd50ec1..da6c75c 100644
--- a/tests/WebComponents/html/element-import.html
+++ b/tests/WebComponents/html/element-import.html
@@ -1,10 +1,11 @@
 <!--
-Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 <x-foo></x-foo>
 <script>
diff --git a/tests/WebComponents/html/html-import-sandbox-iframe.html b/tests/WebComponents/html/html-import-sandbox-iframe.html
index 6b6ca29..1b9c906 100644
--- a/tests/WebComponents/html/html-import-sandbox-iframe.html
+++ b/tests/WebComponents/html/html-import-sandbox-iframe.html
@@ -1,12 +1,13 @@
-<!--
-Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
--->
 <!doctype html>
+<!--
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+-->
 <html>
 	<head>
 		<link rel="import" href="dummy.html">
diff --git a/tests/WebComponents/html/html-import-sandbox.html b/tests/WebComponents/html/html-import-sandbox.html
index ef4a0a5..8416760 100644
--- a/tests/WebComponents/html/html-import-sandbox.html
+++ b/tests/WebComponents/html/html-import-sandbox.html
@@ -1,12 +1,13 @@
-<!--
-Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
--->
 <!doctype html>
+<!--
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+-->
 <html>
 	<head>
 		<script src="../../tools/chai/chai.js"></script>
diff --git a/tests/WebComponents/html/import-upgrade-order.html b/tests/WebComponents/html/import-upgrade-order.html
index 9740ebc..c173f4d 100644
--- a/tests/WebComponents/html/import-upgrade-order.html
+++ b/tests/WebComponents/html/import-upgrade-order.html
@@ -1,9 +1,10 @@
 <!--
-Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 <x-foo id="import"></x-foo>
diff --git a/tests/WebComponents/html/includes/strawkit.js b/tests/WebComponents/html/includes/strawkit.js
index c50494a..6fdc111 100644
--- a/tests/WebComponents/html/includes/strawkit.js
+++ b/tests/WebComponents/html/includes/strawkit.js
@@ -1,4 +1,5 @@
-/*
+/**
+ * @license
  * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
  * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
  * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
diff --git a/tests/WebComponents/html/jquery-shadowdom-polyfill.html b/tests/WebComponents/html/jquery-shadowdom-polyfill.html
index ed90b52..8f771df 100644
--- a/tests/WebComponents/html/jquery-shadowdom-polyfill.html
+++ b/tests/WebComponents/html/jquery-shadowdom-polyfill.html
@@ -1,12 +1,13 @@
+<!doctype html>
 <!--
-Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
-<!DOCTYPE html>
 <html lang="en">
 <head>
   <meta charset="UTF-8">
diff --git a/tests/WebComponents/html/loader-forcepoly.html b/tests/WebComponents/html/loader-forcepoly.html
index 13c6f6e..4aa33f3 100644
--- a/tests/WebComponents/html/loader-forcepoly.html
+++ b/tests/WebComponents/html/loader-forcepoly.html
@@ -1,11 +1,12 @@
-<!DOCTYPE html>
+<!doctype html>
 <!--
-Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 <html>
   <head>
diff --git a/tests/WebComponents/html/smoke.html b/tests/WebComponents/html/smoke.html
index 9969d2e..b743ab6 100644
--- a/tests/WebComponents/html/smoke.html
+++ b/tests/WebComponents/html/smoke.html
@@ -1,11 +1,12 @@
-<!DOCTYPE html>
+<!doctype html>
 <!--
-Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 <html>
   <head>
diff --git a/tests/WebComponents/html/strawkit.html b/tests/WebComponents/html/strawkit.html
index 890d584..0198a2e 100644
--- a/tests/WebComponents/html/strawkit.html
+++ b/tests/WebComponents/html/strawkit.html
@@ -1,11 +1,12 @@
-<!DOCTYPE html>
+<!doctype html>
 <!--
-Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 <html>
   <head>
@@ -20,7 +21,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
     <x-foo></x-foo>
     <element name="x-foo">
       <template>
-        If it's blue (<i><content></content></i>), then IT LIVES! 
+        If it's blue (<i><content></content></i>), then IT LIVES!
       </template>
       <script>
         Polymer.register(this, {
@@ -39,9 +40,9 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
         var assert = chai.assert;
         var elt = document.querySelector('x-foo');
         assert.ok(elt, 'x-foo not found');
-        assert.equal(elt.textContent, 'cordon bleu', 
+        assert.equal(elt.textContent, 'cordon bleu',
             'x-foo has wrong textContent');
-        assert.match(elt.style.backgroundColor, /lightblue|rgb\(173, 216, 230\)/, 
+        assert.match(elt.style.backgroundColor, /lightblue|rgb\(173, 216, 230\)/,
           'x-foo has wrong backgroundColor');
         assert.ok(elt.shadowRoot, 'shadowRoot not available as `.shadowRoot`');
         done();
diff --git a/tests/WebComponents/html/web-components.html b/tests/WebComponents/html/web-components.html
index 0110c06..5228381 100644
--- a/tests/WebComponents/html/web-components.html
+++ b/tests/WebComponents/html/web-components.html
@@ -1,11 +1,12 @@
-<!DOCTYPE html>
+<!doctype html>
 <!--
-Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 <html>
   <head>
diff --git a/tests/WebComponents/runner.html b/tests/WebComponents/runner.html
index 8862386..c51ff32 100644
--- a/tests/WebComponents/runner.html
+++ b/tests/WebComponents/runner.html
@@ -1,8 +1,12 @@
-<!DOCTYPE html>
+<!doctype html>
 <!--
-Copyright 2013 The Polymer Authors. All rights reserved.
-Use of this source code is governed by a BSD-style
-license that can be found in the LICENSE file.
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 <title>WebComponents Tests</title>
 <meta charset="utf-8">
diff --git a/tests/WebComponents/tests.js b/tests/WebComponents/tests.js
index bd9ecec..c074ff5 100644
--- a/tests/WebComponents/tests.js
+++ b/tests/WebComponents/tests.js
@@ -1,4 +1,5 @@
-/*
+/**
+ * @license
  * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
  * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
  * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
diff --git a/tests/runner.html b/tests/runner.html
index 16ad1b0..1e9f76d 100644
--- a/tests/runner.html
+++ b/tests/runner.html
@@ -1,8 +1,12 @@
-<!DOCTYPE html>
+<!doctype html>
 <!--
-Copyright 2013 The Polymer Authors. All rights reserved.
-Use of this source code is governed by a BSD-style
-license that can be found in the LICENSE file.
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 <title>All WebComponents Tests</title>
 <meta charset="utf-8">
@@ -25,8 +29,10 @@ license that can be found in the LICENSE file.
 <script src="HTMLImports/tests.js"></script>
 <script src="ShadowDOM/tests.js"></script>
 <script src="ShadowCSS/tests.js"></script>
+<script src="Template/tests.js"></script>
 <script src="WebComponents/tests.js"></script>
 
+
 <script>
   document.addEventListener('WebComponentsReady', function() {
     mocha.run();
diff --git a/tests/tools/chai/karma.conf.js b/tests/tools/chai/karma.conf.js
index 4a4a0cc..f613164 100644
--- a/tests/tools/chai/karma.conf.js
+++ b/tests/tools/chai/karma.conf.js
@@ -1,4 +1,4 @@
-/*
+/**
  * @license
  * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
  * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
diff --git a/tests/tools/chai/karma.sauce.js b/tests/tools/chai/karma.sauce.js
index c116b87..f4e19fd 100644
--- a/tests/tools/chai/karma.sauce.js
+++ b/tests/tools/chai/karma.sauce.js
@@ -1,4 +1,4 @@
-/*
+/**
  * @license
  * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
  * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
diff --git a/tests/tools/chai/sauce.browsers.js b/tests/tools/chai/sauce.browsers.js
index d1a1d82..44e6623 100644
--- a/tests/tools/chai/sauce.browsers.js
+++ b/tests/tools/chai/sauce.browsers.js
@@ -1,4 +1,4 @@
-/*
+/**
  * @license
  * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
  * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
diff --git a/tests/tools/htmltest.js b/tests/tools/htmltest.js
index e5e1e02..8d52c36 100644
--- a/tests/tools/htmltest.js
+++ b/tests/tools/htmltest.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 // if standalone
@@ -31,7 +35,7 @@ if (window.top === window) {
     window.onerror = null;
     parent.postMessage('ok', '*');
   };
-  
+
   window.onerror = function(x) {
     parent.postMessage({error: x}, '*');
   };
diff --git a/tests/tools/mocha-htmltest.js b/tests/tools/mocha-htmltest.js
index 5e7a274..e3c879a 100644
--- a/tests/tools/mocha-htmltest.js
+++ b/tests/tools/mocha-htmltest.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 (function() {
@@ -68,7 +72,7 @@
 
   function calcBase() {
     var b = base;
-    var script = document._currentScript || 
+    var script = document._currentScript ||
       document.scripts[document.scripts.length - 1];
     if (script) {
       var parts = script.src.split('/');
diff --git a/webcomponents-lite.js b/webcomponents-lite.js
index 5cce0d0..29c786b 100644
--- a/webcomponents-lite.js
+++ b/webcomponents-lite.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 (function() {
@@ -56,6 +60,7 @@
   var modules = [
     'HTMLImports/HTMLImports.js',
     'CustomElements/CustomElements.js',
+    'Template/Template.js',
     // these scripts are loaded here due to polyfill timing issues
     'WebComponents/unresolved.js'
   ];
diff --git a/webcomponents.js b/webcomponents.js
index 395297f..2d090df 100644
--- a/webcomponents.js
+++ b/webcomponents.js
@@ -1,7 +1,11 @@
-/*
- * Copyright 2013 The Polymer Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
+/**
+ * @license
+ * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
  */
 
 (function() {
diff --git a/workbench/ie10-task-flaking.html b/workbench/ie10-task-flaking.html
index b723d2b..c64b300 100644
--- a/workbench/ie10-task-flaking.html
+++ b/workbench/ie10-task-flaking.html
@@ -1,4 +1,13 @@
 <!doctype html>
+<!--
+    @license
+    Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+    This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+    The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+    The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+    Code distributed by Google as part of the polymer project is also
+    subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+-->
 <!--
 Test setup borrowed from Code for Hire's research into this subject:
 http://codeforhire.com/2013/09/21/setimmediate-and-messagechannel-broken-on-internet-explorer-10/