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

src/ol/style/fillstyle.exports

@@ -1 +1 @@
-@exportClass ol.style.Fill ol.style.FillOptions
+@exportSymbol ol.style.Fill

src/ol/style/fillstyle.js

@@ -6,7 +6,7 @@ goog.require('ol.color');
 
 /**
  * @constructor
- * @param {ol.style.FillOptions} options Options.
+ * @param {olx.style.FillOptions} options Options.
  */
 ol.style.Fill = function(options) {
 

src/ol/style/imagestyle.exports

@@ -1 +1 @@
-@exportClass ol.style.Image ol.style.ImageOptions
+@exportSymbol ol.style.Image

src/ol/style/imagestyle.js

@@ -24,7 +24,7 @@ ol.style.ImageState = {
 
 /**
  * @constructor
- * @param {ol.style.ImageOptions} options Options.
+ * @param {olx.style.ImageOptions} options Options.
  * @extends {goog.events.EventTarget}
  */
 ol.style.Image = function(options) {

src/ol/style/strokestyle.exports

@@ -1 +1 @@
-@exportClass ol.style.Stroke ol.style.StrokeOptions
+@exportSymbol ol.style.Stroke

src/ol/style/strokestyle.js

@@ -6,7 +6,7 @@ goog.require('ol.color');
 
 /**
  * @constructor
- * @param {ol.style.StrokeOptions} options Options.
+ * @param {olx.style.StrokeOptions} options Options.
  */
 ol.style.Stroke = function(options) {
 

src/ol/style/style.exports

@@ -1 +1 @@
-@exportClass ol.style.Style ol.style.StyleOptions
+@exportSymbol ol.style.Style

src/ol/style/style.js

@@ -8,7 +8,8 @@ goog.require('ol.style.Image');
 
 /**
  * @constructor
- * @param {ol.style.StyleOptions} options Options.
+ * @param {olx.style.StyleOptions} options Style options.
+ * @todo stability experimental
  */
 ol.style.Style = function(options) {
 

src/ol/style/textstyle.exports

@@ -1 +1 @@
-@exportClass ol.style.Text ol.style.TextOptions
+@exportSymbol ol.style.Text

src/ol/style/textstyle.js

@@ -4,7 +4,7 @@ goog.provide('ol.style.Text');
 
 /**
  * @constructor
- * @param {ol.style.TextOptions} options Options.
+ * @param {olx.style.TextOptions} options Options.
  */
 ol.style.Text = function(options) {