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/test/spec/ol/style/strokesymbolizer.test.js

@@ -55,7 +55,7 @@ describe('ol.style.Stroke', function() {
     it('applies the default values', function() {
       var symbolizer = new ol.style.Stroke({});
 
-      var literal = symbolizer.createLiteral(ol.geom.GeometryType.LINESTRING);
+      var literal = symbolizer.createLiteral(ol.geom.GeometryType.LINE_STRING);
       expect(literal).to.be.a(ol.style.LineLiteral);
       expect(literal.color).to.be('#696969');
       expect(literal.opacity).to.be(0.75);