Merge remote-tracking branch 'upstream/master'

Conflicts:
	GameLibraries/HavokWrapper.dll
	GameLibraries/Sandbox.Audio.dll
	GameLibraries/Sandbox.Common.XmlSerializers.dll
	GameLibraries/Sandbox.Common.dll
	GameLibraries/Sandbox.Game.dll
	GameLibraries/Sandbox.Graphics.dll
	GameLibraries/Sandbox.Input.dll
	GameLibraries/SharpDX.Direct3D9.dll
	GameLibraries/SharpDX.DirectInput.dll
	GameLibraries/SharpDX.RawInput.dll
	GameLibraries/SharpDX.XAudio2.dll
	GameLibraries/SharpDX.dll
	GameLibraries/SpaceEngineersDedicated.exe
	GameLibraries/SteamSDK.dll
	GameLibraries/VRage.Common.dll
	GameLibraries/VRage.Library.dll
	GameLibraries/VRage.Math.dll
	GameLibraries/VRage.Render.dll
	GameLibraries/steam_api64.dll
	GameLibraries/steamclient64.dll
	GameLibraries/tier0_s64.dll
	GameLibraries/vstdlib_s64.dll