rebased onto 8daf040d435d020488ea3f3892c29b627a4a8888
Since this is not covered in our tests, I'm going to merge it as is, thanks! :)
Pull-Request has been merged by pingou