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

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

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

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

diff --cc test/scale.linear.tests.js
index ac190a3c5f91f1c2a74b583a30b2db1baff41186,cd7a2c4b574b203dbe6b847c102da852579df9bb..87b82662d52117d3ed1eb68d544d6892177efc72
--- 1/test/scale.linear.tests.js
--- 2/test/scale.linear.tests.js
+++ b/test/scale.linear.tests.js
@@@ -1396,9 -1394,9 +1396,12 @@@ describe('Linear Scale', function() 
                }, {
                        "name": "rotate",
                        "args": [-1.5707963267948966]
+               },  {
+                       "name": "setFillStyle",
+                       "args": ["#666"]
 +              }, {
 +                      "name": "setFillStyle",
 +                      "args": ["#666"]
                }, {
                        "name": "fillText",
                        "args": ["", 0, 0]