Merge "Didn't mean to check this in..." into ics-mr1