Merge remote-tracking branch 'upstream/general-devel' into cfs-modified

Conflicts:
	TShockAPI/Commands.cs