Merge branch 'release'

# Conflicts:
#	src/chart/pie/labelLayout.js
#	src/chart/sunburst/SunburstPiece.js

src/chart/sunburst/SunburstPiece.js

@@ -87,14 +87,14 @@ SunburstPieceProto.updateData = function (
     var itemModel = node.getModel();
     var layout = node.getLayout();
     // if (!layout) {
-        // console.log(node.getLayout());
+    //     console.log(node.getLayout());
     // }
     var sectorShape = zrUtil.extend({}, layout);
     sectorShape.label = null;
 
     var visualColor = getNodeColor(node, seriesModel, ecModel);
 
-    fillDefaultColor(node, seriesModel, visualColor)
+    fillDefaultColor(node, seriesModel, visualColor);
 
     var normalStyle = itemModel.getModel('itemStyle').getItemStyle();
     var style;
@@ -414,7 +414,7 @@ function isNodeHighlighted(node, activeNode, policy) {
     }
 }
 
-// Fix tooltip callback function params.color incorrect when pick a default color 
+// Fix tooltip callback function params.color incorrect when pick a default color
 function fillDefaultColor(node, seriesModel, color) {
     var data = seriesModel.getData();
     data.setItemVisual(node.dataIndex, 'color', color);