Highstock upgrade, close #1832