Merge remote-tracking branch 'upstream/master'

Conflicts:
	SEModAPIExtensions/API/PluginManager.cs