Update composer.lock.
Merge remote-tracking branch 'origin/master'