git made me do it.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Spectrum/Library/ScriptAssemblies/Assembly-UnityScript.dll