Merge pull request #5256 from totten/master-composer-lock