I'm not sure if this should be merged or not... but I let it here for reference...

/reviewed-on nexedi/slapos!428