@@ -19,6 +19,17 @@ indent_size = 2
 [*.{csproj,pyproj,config}]
 indent_size = 2
 
+# .NET formatting settings
+[*.{cs,vb}]
+dotnet_sort_system_directives_first = true
+dotnet_separate_import_directive_groups = true
+
+[*.cs]
+csharp_new_line_before_open_brace = all
+csharp_new_line_before_else = true
+csharp_new_line_before_catch = true
+csharp_new_line_before_finally = true
+
 # Solution
 [*.sln]
 indent_style = tab
 
@@ -12,6 +12,8 @@
 
 ## Contributors
 
+-   Alex Earl ([@slide](https://github.com/slide))
+-   Alex Helms ([@alexhelms](https://github.com/alexhelms))
 -   Alexandre Catarino([@AlexCatarino](https://github.com/AlexCatarino))
 -   Arvid JB ([@ArvidJB](https://github.com/ArvidJB))
 -   Benoît Hudson ([@benoithudson](https://github.com/benoithudson))
@@ -33,6 +35,7 @@
 -   Ivan Cronyn ([@cronan](https://github.com/cronan))
 -   Jan Krivanek ([@jakrivan](https://github.com/jakrivan))
 -   Jeff Reback ([@jreback](https://github.com/jreback))
+-   Jeff Robbins ([@jeff17robbins](https://github.com/jeff17robbins))
 -   Joe Frayne ([@jfrayne](https://github.com/jfrayne))
 -   Joe Lidbetter ([@jmlidbetter](https://github.com/jmlidbetter))
 -   Joe Savage ([@s4v4g3](https://github.com/s4v4g3))
@@ -41,6 +44,7 @@
 -   Luke Stratman ([@lstratman](https://github.com/lstratman))
 -   Konstantin Posudevskiy ([@konstantin-posudevskiy](https://github.com/konstantin-posudevskiy))
 -   Matthias Dittrich ([@matthid](https://github.com/matthid))
+-   Mohamed Koubaa ([@koubaa](https://github.com/koubaa))
 -   Patrick Stewart ([@patstew](https://github.com/patstew))
 -   Raphael Nestler ([@rnestler](https://github.com/rnestler))
 -   Rickard Holmberg ([@rickardraysearch](https://github.com/rickardraysearch))
 
@@ -10,6 +10,9 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
 ### Added
 
 -   Added automatic NuGet package generation in appveyor and local builds
+-   Added function that sets Py_NoSiteFlag to 1.
+-   Added support for Jetson Nano.
+-   Added support for __len__ for .NET classes that implement ICollection
 
 ### Changed
 
@@ -25,6 +28,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
 - Fixed runtime that fails loading when using pythonnet in an environment
   together with Nuitka
 - Fixes bug where delegates get casts (dotnetcore)
+- Determine size of interpreter longs at runtime
 
 ## [2.4.0][]
 
@@ -45,6 +49,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
 -   Added PyObject finalizer support, Python objects referred by C# can be auto collect now ([#692][p692]).
 -   Added detailed comments about aproaches and dangers to handle multi-app-domains ([#625][p625])
 -   Python 3.7 support, builds and testing added. Defaults changed from Python 3.6 to 3.7 ([#698][p698])
+-   Added support for C# types to provide `__repr__` ([#680][p680])
 
 ### Changed
 
 
@@ -95,6 +95,14 @@ projects using pythonnet can be found in the Wiki:
 
 https://github.com/pythonnet/pythonnet/wiki
 
+Python 3.8.0 support
+--------------------
+
+Some features are disabled in Python 3.8.0 because of
+`this bug in Python <https://bugs.python.org/issue37633>`_. The error is
+``System.EntryPointNotFoundException : Unable to find an entry point named
+'Py_CompileString' in DLL 'python38'``. This will be fixed in Python 3.8.1.
+
 .. |Join the chat at https://gitter.im/pythonnet/pythonnet| image:: https://badges.gitter.im/pythonnet/pythonnet.svg
    :target: https://gitter.im/pythonnet/pythonnet?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
 .. |appveyor shield| image:: https://img.shields.io/appveyor/ci/pythonnet/pythonnet/master.svg?label=AppVeyor
@@ -113,3 +121,8 @@ https://github.com/pythonnet/pythonnet/wiki
    :target: http://stackoverflow.com/questions/tagged/python.net
 .. |conda-forge version| image:: https://img.shields.io/conda/vn/conda-forge/pythonnet.svg
    :target: https://anaconda.org/conda-forge/pythonnet
+
+Resources
+---------
+Mailing list: https://mail.python.org/mailman/listinfo/pythondotnet
+Chat: https://gitter.im/pythonnet/pythonnet
@@ -23,10 +23,13 @@ environment:
       BUILD_OPTS: --xplat
     - PYTHON_VERSION: 3.7
       BUILD_OPTS: --xplat
+    - PYTHON_VERSION: 3.8
+      BUILD_OPTS: --xplat
     - PYTHON_VERSION: 2.7
     - PYTHON_VERSION: 3.5
     - PYTHON_VERSION: 3.6
     - PYTHON_VERSION: 3.7
+    - PYTHON_VERSION: 3.8
 
     - PYTHON_VERSION: 3.7
       PYTHONNET_SOFT_SHUTDOWN: 1
@@ -36,6 +39,9 @@ matrix:
       - PYTHON_VERSION: 3.4
         BUILD_OPTS: --xplat
       - PYTHON_VERSION: 3.4
+      - PYTHON_VERSION: 3.8
+        BUILD_OPTS: --xplat
+      - PYTHON_VERSION: 3.8
 
 init:
   # Update Environment Variables based on matrix/platform