diff --git a/devtools/docs/.gitignore b/devtools/docs/.gitignore
deleted file mode 100644
index 9a8882dd2..000000000
--- a/devtools/docs/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-_book
\ No newline at end of file
diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp
index 046934277..5ff77092a 100644
--- a/dom/ipc/ContentChild.cpp
+++ b/dom/ipc/ContentChild.cpp
@@ -2817,10 +2817,10 @@ bool
 ContentChild::RecvGetFilesResponse(const nsID& aUUID,
                                    const GetFilesResponseResult& aResult)
 {
-  GetFilesHelperChild* child = mGetFilesPendingRequests.GetWeak(aUUID);
+  RefPtr<GetFilesHelperChild> child;
   // This object can already been deleted in case DeleteGetFilesRequest has
   // been called when the response was sending by the parent.
-  if (!child) {
+  if (!mGetFilesPendingRequests.Remove(aUUID, getter_AddRefs(child))) {
     return true;
   }
 
@@ -2841,7 +2841,6 @@ ContentChild::RecvGetFilesResponse(const nsID& aUUID,
     child->Finished(succeeded ? NS_OK : NS_ERROR_OUT_OF_MEMORY);
   }
 
-  mGetFilesPendingRequests.Remove(aUUID);
   return true;
 }
 
diff --git a/js/src/.gitignore b/js/src/.gitignore
deleted file mode 100644
index 2f7896d1d..000000000
--- a/js/src/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-target/
diff --git a/media/webrtc/trunk/webrtc/.gitignore b/media/webrtc/trunk/webrtc/.gitignore
deleted file mode 100644
index 9c8d698f3..000000000
--- a/media/webrtc/trunk/webrtc/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# This file is for projects that checkout webrtc/ directly (e.g. Chromium).
-*.mk
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index b16e58d71..e29f4cb56 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -1349,6 +1349,7 @@ pref("network.protocol-handler.external.vbscript", false);
 pref("network.protocol-handler.external.javascript", false);
 pref("network.protocol-handler.external.data", false);
 pref("network.protocol-handler.external.ms-help", false);
+pref("network.protocol-handler.external.mk", false);
 pref("network.protocol-handler.external.res", false);
 pref("network.protocol-handler.external.shell", false);
 pref("network.protocol-handler.external.vnd.ms.radio", false);
diff --git a/nsprpub/config/.cvsignore b/nsprpub/config/.cvsignore
deleted file mode 100644
index bb3ee4bcc..000000000
--- a/nsprpub/config/.cvsignore
+++ /dev/null
@@ -1,11 +0,0 @@
-nfspwd
-revdepth
-my_config.mk
-my_overrides.mk
-autoconf.mk
-nsprincl.mk
-nsprincl.sh
-now
-Makefile
-nsinstall
-nspr-config
diff --git a/nsprpub/lib/.cvsignore b/nsprpub/lib/.cvsignore
deleted file mode 100644
index f3c7a7c5d..000000000
--- a/nsprpub/lib/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/nsprpub/lib/ds/.cvsignore b/nsprpub/lib/ds/.cvsignore
deleted file mode 100644
index bcab60f5a..000000000
--- a/nsprpub/lib/ds/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-_pl_bld.h
diff --git a/nsprpub/lib/libc/.cvsignore b/nsprpub/lib/libc/.cvsignore
deleted file mode 100644
index f3c7a7c5d..000000000
--- a/nsprpub/lib/libc/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/nsprpub/lib/libc/include/.cvsignore b/nsprpub/lib/libc/include/.cvsignore
deleted file mode 100644
index f3c7a7c5d..000000000
--- a/nsprpub/lib/libc/include/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/nsprpub/lib/libc/src/.cvsignore b/nsprpub/lib/libc/src/.cvsignore
deleted file mode 100644
index bcab60f5a..000000000
--- a/nsprpub/lib/libc/src/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-_pl_bld.h
diff --git a/nsprpub/lib/prstreams/.cvsignore b/nsprpub/lib/prstreams/.cvsignore
deleted file mode 100644
index f3c7a7c5d..000000000
--- a/nsprpub/lib/prstreams/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/nsprpub/lib/prstreams/tests/testprstrm/.cvsignore b/nsprpub/lib/prstreams/tests/testprstrm/.cvsignore
deleted file mode 100644
index f3c7a7c5d..000000000
--- a/nsprpub/lib/prstreams/tests/testprstrm/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/nsprpub/lib/tests/.cvsignore b/nsprpub/lib/tests/.cvsignore
deleted file mode 100644
index f3c7a7c5d..000000000
--- a/nsprpub/lib/tests/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/nsprpub/pr/.cvsignore b/nsprpub/pr/.cvsignore
deleted file mode 100644
index f3c7a7c5d..000000000
--- a/nsprpub/pr/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/nsprpub/pr/include/.cvsignore b/nsprpub/pr/include/.cvsignore
deleted file mode 100644
index f3c7a7c5d..000000000
--- a/nsprpub/pr/include/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/nsprpub/pr/include/md/.cvsignore b/nsprpub/pr/include/md/.cvsignore
deleted file mode 100644
index f3c7a7c5d..000000000
--- a/nsprpub/pr/include/md/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/nsprpub/pr/include/obsolete/.cvsignore b/nsprpub/pr/include/obsolete/.cvsignore
deleted file mode 100644
index f3c7a7c5d..000000000
--- a/nsprpub/pr/include/obsolete/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/nsprpub/pr/include/private/.cvsignore b/nsprpub/pr/include/private/.cvsignore
deleted file mode 100644
index f3c7a7c5d..000000000
--- a/nsprpub/pr/include/private/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/nsprpub/pr/src/.cvsignore b/nsprpub/pr/src/.cvsignore
deleted file mode 100644
index 41a1bd2b7..000000000
--- a/nsprpub/pr/src/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-_pr_bld.h
diff --git a/nsprpub/pr/src/cplus/.cvsignore b/nsprpub/pr/src/cplus/.cvsignore
deleted file mode 100644
index f3c7a7c5d..000000000
--- a/nsprpub/pr/src/cplus/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/nsprpub/pr/src/cplus/tests/.cvsignore b/nsprpub/pr/src/cplus/tests/.cvsignore
deleted file mode 100644
index f3c7a7c5d..000000000
--- a/nsprpub/pr/src/cplus/tests/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/nsprpub/pr/src/io/.cvsignore b/nsprpub/pr/src/io/.cvsignore
deleted file mode 100644
index f3c7a7c5d..000000000
--- a/nsprpub/pr/src/io/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/nsprpub/pr/src/linking/.cvsignore b/nsprpub/pr/src/linking/.cvsignore
deleted file mode 100644
index f3c7a7c5d..000000000
--- a/nsprpub/pr/src/linking/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/nsprpub/pr/src/malloc/.cvsignore b/nsprpub/pr/src/malloc/.cvsignore
deleted file mode 100644
index f3c7a7c5d..000000000
--- a/nsprpub/pr/src/malloc/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/nsprpub/pr/src/md/.cvsignore b/nsprpub/pr/src/md/.cvsignore
deleted file mode 100644
index f3c7a7c5d..000000000
--- a/nsprpub/pr/src/md/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/nsprpub/pr/src/md/os2/.cvsignore b/nsprpub/pr/src/md/os2/.cvsignore
deleted file mode 100644
index f3c7a7c5d..000000000
--- a/nsprpub/pr/src/md/os2/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/nsprpub/pr/src/md/unix/.cvsignore b/nsprpub/pr/src/md/unix/.cvsignore
deleted file mode 100644
index f3c7a7c5d..000000000
--- a/nsprpub/pr/src/md/unix/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/nsprpub/pr/src/md/windows/.cvsignore b/nsprpub/pr/src/md/windows/.cvsignore
deleted file mode 100644
index f3c7a7c5d..000000000
--- a/nsprpub/pr/src/md/windows/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/nsprpub/pr/src/memory/.cvsignore b/nsprpub/pr/src/memory/.cvsignore
deleted file mode 100644
index f3c7a7c5d..000000000
--- a/nsprpub/pr/src/memory/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/nsprpub/pr/src/misc/.cvsignore b/nsprpub/pr/src/misc/.cvsignore
deleted file mode 100644
index f3c7a7c5d..000000000
--- a/nsprpub/pr/src/misc/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/nsprpub/pr/src/pthreads/.cvsignore b/nsprpub/pr/src/pthreads/.cvsignore
deleted file mode 100644
index f3c7a7c5d..000000000
--- a/nsprpub/pr/src/pthreads/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/nsprpub/pr/src/threads/.cvsignore b/nsprpub/pr/src/threads/.cvsignore
deleted file mode 100644
index f3c7a7c5d..000000000
--- a/nsprpub/pr/src/threads/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/nsprpub/pr/src/threads/combined/.cvsignore b/nsprpub/pr/src/threads/combined/.cvsignore
deleted file mode 100644
index f3c7a7c5d..000000000
--- a/nsprpub/pr/src/threads/combined/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/nsprpub/pr/tests/.cvsignore b/nsprpub/pr/tests/.cvsignore
deleted file mode 100644
index f3c7a7c5d..000000000
--- a/nsprpub/pr/tests/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/nsprpub/pr/tests/dll/.cvsignore b/nsprpub/pr/tests/dll/.cvsignore
deleted file mode 100644
index f3c7a7c5d..000000000
--- a/nsprpub/pr/tests/dll/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/nsprpub/tools/.cvsignore b/nsprpub/tools/.cvsignore
deleted file mode 100644
index f3c7a7c5d..000000000
--- a/nsprpub/tools/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/python/pystache/.gitignore b/python/pystache/.gitignore
deleted file mode 100644
index 758d62df9..000000000
--- a/python/pystache/.gitignore
+++ /dev/null
@@ -1,17 +0,0 @@
-*.pyc
-.DS_Store
-# Tox support.  See: http://pypi.python.org/pypi/tox
-.tox
-# Our tox runs convert the doctests in *.rst files to Python 3 prior to
-# running tests.  Ignore these temporary files.
-*.temp2to3.rst
-# The setup.py "prep" command converts *.md to *.temp.rst (via *.temp.md).
-*.temp.md
-*.temp.rst
-# TextMate project file
-*.tmproj
-# Distribution-related folders and files.
-build
-dist
-MANIFEST
-pystache.egg-info
diff --git a/python/slugid/.gitignore b/python/slugid/.gitignore
deleted file mode 100644
index ba7466050..000000000
--- a/python/slugid/.gitignore
+++ /dev/null
@@ -1,57 +0,0 @@
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-env/
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-*.egg-info/
-.installed.cfg
-*.egg
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*,cover
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-target/
diff --git a/security/nss/.gitignore b/security/nss/.gitignore
deleted file mode 100644
index b137867f5..000000000
--- a/security/nss/.gitignore
+++ /dev/null
@@ -1,21 +0,0 @@
-*~
-*.swp
-*OPT.OBJ/
-*DBG.OBJ/
-*DBG.OBJD/
-out/*
-*.pyc
-*.bak
-*.out
-*.rej
-*.patch
-GPATH
-GRTAGS
-GTAGS
-#*
-.#*
-.ycm_extra_conf.py*
-fuzz/libFuzzer/*
-fuzz/corpus
-fuzz/out
-.chk
diff --git a/security/nss/doc/.hgignore b/security/nss/doc/.hgignore
deleted file mode 100644
index b3a4c423a..000000000
--- a/security/nss/doc/.hgignore
+++ /dev/null
@@ -1,3 +0,0 @@
-date.xml
-version.xml
-
diff --git a/security/nss/doc/html/.hgignore b/security/nss/doc/html/.hgignore
deleted file mode 100644
index 9c92a72e8..000000000
--- a/security/nss/doc/html/.hgignore
+++ /dev/null
@@ -1 +0,0 @@
-*.proc
diff --git a/testing/tps/.gitignore b/testing/tps/.gitignore
deleted file mode 100644
index 65f8b6e05..000000000
--- a/testing/tps/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# These files are added by running the TPS test suite.
-build/
-dist/
-tps.egg-info/
diff --git a/testing/xpcshell/node-http2/.gitignore b/testing/xpcshell/node-http2/.gitignore
deleted file mode 100644
index bc483625e..000000000
--- a/testing/xpcshell/node-http2/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-node_modules
-.idea
-coverage
-doc
-.vscode/.browse*
-npm-debug.log
-typings
\ No newline at end of file
diff --git a/xpcom/reflect/xptcall/md/unix/xptcinvoke_arm.cpp b/xpcom/reflect/xptcall/md/unix/xptcinvoke_arm.cpp
index 6475132bc..7c16d0146 100644
--- a/xpcom/reflect/xptcall/md/unix/xptcinvoke_arm.cpp
+++ b/xpcom/reflect/xptcall/md/unix/xptcinvoke_arm.cpp
@@ -9,7 +9,7 @@
 
 #include "mozilla/Compiler.h"
 
-#if !defined(__arm__) && !(defined(LINUX)
+#if !defined(__arm__) && !defined(LINUX)
 #error "This code is for Linux ARM only. Check that it works on your system, too.\nBeware that this code is highly compiler dependent."
 #endif
 
diff --git a/xpcom/threads/TimerThread.cpp b/xpcom/threads/TimerThread.cpp
index d92c2ef90..db7c92462 100644
--- a/xpcom/threads/TimerThread.cpp
+++ b/xpcom/threads/TimerThread.cpp
@@ -170,6 +170,7 @@ public:
   void operator delete(void* aPtr)
   {
     sAllocator->Free(aPtr);
+    sAllocatorUsers--;
     DeleteAllocatorIfNeeded();
   }
 
@@ -193,7 +194,6 @@ private:
   {
     MOZ_ASSERT(!sCanDeleteAllocator || sAllocatorUsers > 0,
                "This will result in us attempting to deallocate the nsTimerEvent allocator twice");
-    sAllocatorUsers--;
   }
 
   RefPtr<nsTimerImpl> mTimer;