MPS updated to 3.1.1
Merge branch 'master' into cuttingedge