Alright, I created the pull-request so that it can be reviewed eventually (hopefully in a few hours).