Sure, can include it and resolve the conflicts or merge it afterwards. @elliottmc?
maybe @Scythe42 : can you include the patch/branch to your work as it's an improvement of MP system/core and manage conflicts ...
but is not urgent ! i know your are overcharged ...
Was my goal, it's only for solve conflict, because i fear with all changes made by scythe, the patch (branch) would be totally broken.We should not add it to Scythe's branch. It is a totally unrelated fix, and should be treated as such. Let's get one branch merged, resolve the conflicts and then get the next one in.