Merge remote-tracking branch 'origin/v2.0-dev' into v2.0-dev-tooltip-refactor

diff --cc samples/line.html
Simple merge

diff --cc src/core/core.controller.js
Simple merge

diff --cc src/core/core.helpers.js
Simple merge

diff --cc src/core/core.js
Simple merge

diff --cc src/core/core.scale.js
index c9f8423399c2cd6b67f2fd2efce22cff424900ff,23b5a9b70d2cdc659f9e89a4bdf48d61c0e008ec..e768726ce7447d1662e4203c3e04953085d7fec1
--- 1/src/core/core.scale.js
--- 2/src/core/core.scale.js
+++ b/src/core/core.scale.js
@@@ -503,10 -503,10 +512,10 @@@
                                                                }
                                                        }
  
 -                                                      
 +
                                                        this.ctx.translate(xLabelValue, yLabelValue);
                                                        this.ctx.rotate(helpers.toRadians(this.labelRotation) * -1);
-                                                       this.ctx.font = this.font;
+                                                       this.ctx.font = labelFont;
                                                        this.ctx.textBaseline = "middle";
                                                        this.ctx.fillText(label, 0, 0);
                                                        this.ctx.restore();

diff --cc src/scales/scale.linear.js
Simple merge

diff --cc src/scales/scale.logarithmic.js
Simple merge

diff --cc src/scales/scale.radialLinear.js
Simple merge