Oh, yes, actually this pull requests has conflicts so won't merge anyway.

Do you think you can rebase it off the current master?