This is not a "merge request" strictly speaking, just a place to keep the current version running on lab.nexedi.com

/cc @alain.takoudjou