Merge changes from Chart.Net master branch