Merge branch 'master' of github.com:openlayers/ol3 into vector

Resolved conflicts:
  src/ol/renderer/canvas/canvasrenderer.js

src/ol/renderer/canvas/canvasimagelayerrenderer.js

@@ -94,6 +94,7 @@ ol.renderer.canvas.ImageLayer.prototype.renderFrame =
 
   if (!goog.isNull(this.image_)) {
     image = this.image_;
+
     var imageExtent = image.getExtent();
     var imageResolution = image.getResolution();
     var transform = this.transform_;
@@ -111,5 +112,7 @@ ol.renderer.canvas.ImageLayer.prototype.renderFrame =
         (imageExtent.minX - viewCenter.x) / imageResolution,
         (viewCenter.y - imageExtent.maxY) / imageResolution,
         0);
+
+    this.updateAttributions(frameState.attributions, image.getAttributions());
   }
 };

src/ol/renderer/canvas/canvasrenderer.js

@@ -1,5 +1,5 @@
 goog.provide('ol.renderer.canvas.Renderer');
-goog.provide('ol.renderer.canvas.isSupported');
+goog.provide('ol.renderer.canvas.SUPPORTED');
 
 goog.require('goog.asserts');
 goog.require('goog.vec.Mat4');
@@ -17,9 +17,10 @@ goog.require('ol.style.SymbolizerLiteral');
 
 
 /**
- * @return {boolean} Is supported.
+ * @const
+ * @type {boolean} Is supported.
  */
-ol.renderer.canvas.isSupported = ol.canvas.isSupported;
+ol.renderer.canvas.SUPPORTED = ol.canvas.SUPPORTED;
 
 
 
@@ -291,4 +292,3 @@ ol.renderer.canvas.Renderer.renderShape = function(shape) {
   }
   return canvas;
 };
-