Version update.
Merge branch 'master' into ice_charting