Make m2 sans serif, remove dangling assignment.
Merge remote-tracking branch 'tpdextras/master' into videoClient