Really need to put OS files under version control ?
Manual merge of #5ea7f38 in the twig template (not tested)