Merge branch 'v2.0-dev' into fix/1725

Conflicts:
	src/core/core.controller.js

diff --cc src/core/core.controller.js
index b1fd2387503900e83efa9cb1adc379c5d1c62854,e9f1e87db08be0733a6badde513b6d560ee5ad46..9a8304b3d5d287c758c66b0ae8682110c42798ca
--- 1/src/core/core.controller.js
--- 2/src/core/core.controller.js
+++ b/src/core/core.controller.js
@@@ -212,8 -242,6 +240,8 @@@
                        // Make sure dataset controllers are updated and new controllers are reset
                        this.buildOrUpdateControllers(true);
  
-                       Chart.scaleService.update(this, this.chart.width, this.chart.height);
++                      Chart.layoutService.update(this, this.chart.width, this.chart.height);
 +
                        // Make sure all dataset controllers have correct meta data counts
                        helpers.each(this.data.datasets, function(dataset, datasetIndex) {
                                dataset.controller.buildOrUpdateElements();