Update composer.lock
Merge branch '1.3'