Merge back from Renaud

Git sure is a thing