Merged to master (commit ec1c0f448893775b660313042709a9b057b3ab75). I reverted the message._messageName-patch in commit 59f3b78349d8de267cf69fb8873971ff0d9ecf7b as that one is obsolete with the patches in this bug.
Arthur, turns out your branch contained a wrong patch. I fixed that by reverting the bad commit (which was efdc83fec6244d5f2e4b8880fef010a6e362d9dc) and cherry-picking rustybird's original patch (this is now commit 6016a170f0266cf926b7ff305796ba83cc353536).
Arthur turns out your branch contained a wrong patch. I fixed that by reverting the bad commit (which was efdc83fec6244d5f2e4b8880fef010a6e362d9dc) and cherry-picking rustybird's original patch (this is now commit 6016a170f0266cf926b7ff305796ba83cc353536).