Merge remote-tracking branch 'upstream/development'

Conflicts:
	vendor/sources.json