>> >>I managed to port it over, and in the second patch I squashed both >>changes into one diff hunk, those two hunks touching the same file >>confused me slightly initially ^^ oh, sorry, it was 2 patches from the initial github PR, and I have merged them in the same patch manually, not cleanly