Merge branch 'master' into 3.0.0

diff --cc gulpfile.js
index 476dc00c7e7c9c7d285109c6b49245b909a7dbee,472c22d5e0bcb2eea2fa68850cd54522639e40e9..7edc71f44cb5508178ac9440594f644fb091694e
--- 1/gulpfile.js
--- 2/gulpfile.js
+++ b/gulpfile.js
@@@ -41,9 -41,10 +41,10 @@@ var parts = 
  , 'src/number.js'\r
  , 'src/viewbox.js'\r
  , 'src/element.js'\r
 -, 'src/fx.js'\r
 +, 'src/fxnew.js'\r
  , 'src/boxes.js'\r
  , 'src/matrix.js'\r
+ , 'src/point.js'\r
  , 'src/attr.js'\r
  , 'src/transform.js'\r
  , 'src/style.js'\r

diff --cc src/transform.js
Simple merge