Merge remote-tracking branch 'upstream/master' into cloning

Conflicts:
	Assets/Scripts/Player/Player.cs