More work on highcharts.
Merge remote-tracking branch 'origin/High-Charts'