added msm
added msm
merged from trunk
merged from trunk
merged revision 63304
merged revisions 63264-63282
removed unneeded files (merge error)
merged revision 63498
merged revision 63613
merged revision 63704
merged revision 63705
merged revisions 63060-65696
merged revisions 63705-65842
merged revisions 65817-65847
merged revision 65848
merged revision 65887
merged revisions 66490-67658
msm v2.20
merged rev. 68213
merged rev. 67897