Merge remote-tracking branch 'upstream/master' into vector-cubic-bezier

Conflicts:
	old/src/ol/style/strokesymbolizer.js
	src/ol/render/canvas/canvasimmediate.js
Fixed example
Merge branch 'vector-cubic-bezier' into private-master

Conflicts:
	src/ol/render/canvas/canvasimmediate.js