Peter Wagner's patch does not apply on 3.5.6-Final, it needs a few adjustments. I tried to share an updated patch but in case it would not upload, here is a pastebin link.