Merge "Up version number for release" into ics-mr1