Files should end with a trailing newline.
Removed Composer lock file from repo.
Merged 'master'.