Merge remote-tracking branch 'upstream/master' into vector-api

Conflicts:
	src/objectliterals.jsdoc
	src/ol/attribution.js
	src/ol/geom/geometry.js
	src/ol/geom/geometrycollection.js
	src/ol/geom/linestring.js
	src/ol/layer/vectorlayer.exports
	src/ol/layer/vectorlayer.js
	src/ol/map.js
	src/ol/proj/proj.js
	src/ol/renderer/canvas/canvasvectorlayerrenderer.js
	src/ol/source/imagewmssource.js
	src/ol/source/tilewmssource.js
	src/ol/source/vectorsource.exports
	src/ol/source/vectorsource.js
	src/ol/source/wmssource.js
	src/ol/style/style.js
	src/ol/tilegrid/tilegrid.js
	src/ol/tilegrid/wmtstilegrid.js
	src/ol/tilegrid/xyztilegrid.js

old/src/ol/style/fillsymbolizer.js

@@ -14,7 +14,7 @@ goog.require('ol.style.Symbolizer');
 /**
  * @constructor
  * @extends {ol.style.Symbolizer}
- * @param {ol.style.FillOptions=} opt_options Polygon options.
+ * @param {olx.style.FillOptions=} opt_options Polygon options.
  * @todo stability experimental
  */
 ol.style.Fill = function(opt_options) {
@@ -68,7 +68,7 @@ ol.style.Fill.prototype.createLiteral = function(featureOrType) {
   var literal = null;
 
   if (type === ol.geom.GeometryType.POLYGON ||
-      type === ol.geom.GeometryType.MULTIPOLYGON) {
+      type === ol.geom.GeometryType.MULTI_POLYGON) {
 
     var color = ol.expr.evaluateFeature(this.color_, feature);
     goog.asserts.assertString(