Merge changes from chart.net master branch.
Merge changes from chart.net master branch.