Olivier Massot cbf56f217b fix merge conflicts 2 rokov pred
..
schema-extensions cbf56f217b fix merge conflicts 2 rokov pred