Forgot to mention: the patch is for the current master, commit 0110f9ce43676a340474e58d09fdec8494dabdf2
Forgot to mention: the patch is for the current master, 40474e58d09fdec 8494dabdf2
commit 0110f9ce43676a3