composer.lock updated
Merge branch '1.8'