New lock, and composer.phar.
Merge branch 'develop' into feature/twig-filters