Version update.
Fixing some of the regressions brought by the recent commit.
Merge branch 'master' into ice_charting