Removing `composer.lock`, which is gitignored anyway
Merge remote branch 'upstream/master'

Conflicts:
	composer.lock