Merge remote-tracking branch 'origin/master'

# Conflicts:
#	LibGit2Sharp/Core/NativeMethods.cs

LibGit2Sharp/Core/NativeMethods.cs

@@ -21,9 +21,7 @@ internal static class NativeMethods
         // An object tied to the lifecycle of the NativeMethods static class.
         // This will handle initialization and shutdown of the underlying
         // native library.
-#pragma warning disable 0414
-        private static readonly NativeShutdownObject shutdownObject;
-        #pragma warning restore 0414
+        private static NativeShutdownObject shutdownObject;
 
         static NativeMethods()
         {
@@ -1804,23 +1802,24 @@ internal static extern unsafe void git_status_list_free(
         internal static extern void git_strarray_free(
             ref GitStrArray array);
 
-        [DllImport(libgit2)]
+        [DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
+        internal static extern unsafe int git_submodule_lookup(
+            out git_submodule* reference,
+            git_repository* repo,
+            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string name);
+
+        [DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
         internal static extern unsafe int git_submodule_add_setup(
            out git_submodule* reference,
            git_repository* repo,
            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string url,
            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictFilePathMarshaler))] FilePath name,
            int use_gitlink);
 
-        [DllImport(libgit2)]
+        [DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
         internal static extern unsafe int git_submodule_add_finalize(
             git_submodule* reference);
 
-        [DllImport(libgit2)]
-        internal static extern unsafe int git_submodule_lookup(
-            out git_submodule* reference,
-            git_repository* repo,
-            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string name);
 
         [DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
         internal static extern unsafe int git_submodule_resolve_url(