Intermediate commit so i can - eventually - move to my new laptop
merged