Update msm_ion header
Merge branch 'cm-11.0' into martincz