This looks good but for some reasons it wants to do a merge commit, could you see if you could rebase your work against the latest master?
I have been trying to apply the patch manually but it fails, could you try rebasing your branch on the top of the current master ?
(Feel free to ping me on irc if you do not know how or have difficulty doing it)