Merge remote-tracking branch 'origin/ConnectPro_v1.1' into ConnectPro_v1.3

# Conflicts:
#	CHANGELOG.md
#	ICD.Common.Utils/Properties/AssemblyInfo.cs

CHANGELOG.md

@@ -69,6 +69,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
  - Better VC-4 support for IcdConsole
  - JSON refactoring for simpler deserialization
 
+## [8.6.1] - 2019-06-14
+### Changed
+ - Fixed a bug where stopped timers on NetStandard would still have a periodic callback duration
+
 ## [8.6.0] - 2019-06-14
 ### Changed
  - Overhaul of RangeAttribute remap methods to better avoid overflows

ICD.Common.Utils/Timers/SafeTimer.cs

@@ -67,8 +67,8 @@ namespace ICD.Common.Utils.Timers
 		/// <returns></returns>
 		public static SafeTimer Stopped(Action callback)
 		{
-			// Some arbitrarily large number that shouldn't timeout before we call stop.
-			SafeTimer output = new SafeTimer(callback, 100 * 1000, 100 * 1000);
+			//No due time or repeat period on a stopped timer
+			SafeTimer output = new SafeTimer(callback, -1, -1);
 			output.Stop();
 			return output;
 		}