Merge branch 'master' of https://github.com/plotly/plotly.js into icicle-trace-base

merge from master

Author: Coding-with-Adam