Merge branch 'master' into fix-3308

Conflicts:
	src/lib/dom-tree-api.html

src/lib/dom-innerHTML.html

@@ -116,7 +116,6 @@ Polymer.domInnerHTML = (function() {
       node = node.content;
     var s = '';
     var c$ = Polymer.dom(node).childNodes;
-    c$ = composed ? node._composedChildren : c$;
     for (var i=0, l=c$.length, child; (i<l) && (child=c$[i]); i++) {  
       s += getOuterHTML(child, node, composed);
     }

src/lib/dom-tree-api.html

@@ -299,4 +299,4 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
   };
 
 })();
-</script>
+</script>