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

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

CHANGELOG.md

@@ -72,6 +72,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.7.0] - 2019-06-24
+### Added
+ - IcdXmlException exposes line number and position properties
+
 ## [8.6.1] - 2019-06-14
 ### Changed
  - Fixed a bug where stopped timers on NetStandard would still have a periodic callback duration

ICD.Common.Utils/Xml/IcdXmlException.cs

@@ -9,8 +9,12 @@ namespace ICD.Common.Utils.Xml
 {
 	public sealed class IcdXmlException : Exception
 	{
-		private int m_LineNumber;
-		private int m_LinePosition;
+		private readonly int m_LineNumber;
+		private readonly int m_LinePosition;
+
+		public int LineNumber { get { return m_LineNumber; } }
+
+		public int LinePosition { get { return m_LinePosition; } }
 
 		/// <summary>
 		/// Constructor.