Olivier Massot cbf56f217b fix merge conflicts 1 rok pred
..
schema-extensions cbf56f217b fix merge conflicts 1 rok pred