Merge origin/builds into builds

prushfor · prushfor · commit db94ba0c3dd5 · 2016-06-24T11:20:46.000-04:00
Conflicts:
	map-styles.html
diff --git a/map-styles.html b/map-styles.html
@@ -516,4 +516,4 @@
 	}
     </style>
   </template>
-</dom-module>
+</dom-module>
