Merge branch 'macclane' into macclane-lille (sauf le composer.lock)