I have updated the patch that is now the one merged upstream.