Fixed weighted MP calculation; see RT ticket #3993
Merge branch 'master' into kill_mdluser