diff --git a/options/gitignore/Actionscript b/options/gitignore/Actionscript
index 11e612e9853..5d947ca8879 100644
--- a/options/gitignore/Actionscript
+++ b/options/gitignore/Actionscript
@@ -1,9 +1,8 @@
 # Build and Release Folders
-bin/
 bin-debug/
 bin-release/
-[Oo]bj/ # FlashDevelop obj
-[Bb]in/ # FlashDevelop bin
+[Oo]bj/
+[Bb]in/
 
 # Other files and folders
 .settings/
diff --git a/options/gitignore/Android b/options/gitignore/Android
index 520a86352f7..69eda01429a 100644
--- a/options/gitignore/Android
+++ b/options/gitignore/Android
@@ -1,6 +1,7 @@
 # Built application files
 *.apk
 *.ap_
+*.aab
 
 # Files for the ART/Dalvik VM
 *.dex
@@ -32,16 +33,20 @@ proguard/
 # Android Studio captures folder
 captures/
 
-# Intellij
+# IntelliJ
 *.iml
 .idea/workspace.xml
 .idea/tasks.xml
 .idea/gradle.xml
+.idea/assetWizardSettings.xml
 .idea/dictionaries
 .idea/libraries
+.idea/caches
 
 # Keystore files
-*.jks
+# Uncomment the following lines if you do not want to check your keystore files in.
+#*.jks
+#*.keystore
 
 # External native build folder generated in Android Studio 2.2 and later
 .externalNativeBuild
@@ -53,3 +58,10 @@ google-services.json
 freeline.py
 freeline/
 freeline_project_description.json
+
+# fastlane
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
+fastlane/readme.md
diff --git a/options/gitignore/Archives b/options/gitignore/Archives
index e9eda68baf2..43fd5582f91 100644
--- a/options/gitignore/Archives
+++ b/options/gitignore/Archives
@@ -5,17 +5,18 @@
 *.rar
 *.zip
 *.gz
+*.tgz
 *.bzip
 *.bz2
 *.xz
 *.lzma
 *.cab
 
-#packing-only formats
+# Packing-only formats
 *.iso
 *.tar
 
-#package management formats
+# Package management formats
 *.dmg
 *.xpi
 *.gem
diff --git a/options/gitignore/Autotools b/options/gitignore/Autotools
index e3923f96fce..f4f545c9ca4 100644
--- a/options/gitignore/Autotools
+++ b/options/gitignore/Autotools
@@ -9,13 +9,15 @@ Makefile.in
 
 # http://www.gnu.org/software/autoconf
 
-/autom4te.cache
+autom4te.cache
 /autoscan.log
 /autoscan-*.log
 /aclocal.m4
 /compile
 /config.guess
 /config.h.in
+/config.log
+/config.status
 /config.sub
 /configure
 /configure.scan
@@ -31,3 +33,11 @@ Makefile.in
 # http://www.gnu.org/software/texinfo
 
 /texinfo.tex
+
+# http://www.gnu.org/software/m4/
+
+m4/libtool.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4
diff --git a/options/gitignore/Backup b/options/gitignore/Backup
new file mode 100644
index 00000000000..825ce52db53
--- /dev/null
+++ b/options/gitignore/Backup
@@ -0,0 +1,5 @@
+*.bak
+*.gho
+*.ori
+*.orig
+*.tmp
diff --git a/options/gitignore/C b/options/gitignore/C
index 8a365b3d829..c6127b38c1a 100644
--- a/options/gitignore/C
+++ b/options/gitignore/C
@@ -45,6 +45,7 @@
 # Kernel Module Compile Results
 *.mod*
 *.cmd
+.tmp_versions/
 modules.order
 Module.symvers
 Mkfile.old
diff --git a/options/gitignore/Clojure b/options/gitignore/Clojure
index e69de29bb2d..a4cb69a32cc 100644
--- a/options/gitignore/Clojure
+++ b/options/gitignore/Clojure
@@ -0,0 +1,14 @@
+pom.xml
+pom.xml.asc
+*.jar
+*.class
+/lib/
+/classes/
+/target/
+/checkouts/
+.lein-deps-sum
+.lein-repl-history
+.lein-plugins/
+.lein-failures
+.nrepl-port
+.cpcache/
diff --git a/options/gitignore/CodeKit b/options/gitignore/CodeKit
index bd9e67fcca2..09b84126cea 100644
--- a/options/gitignore/CodeKit
+++ b/options/gitignore/CodeKit
@@ -1,3 +1,4 @@
 # General CodeKit files to ignore
 config.codekit
+config.codekit3
 /min
diff --git a/options/gitignore/Composer b/options/gitignore/Composer
index c4222678424..a67d42b32f8 100644
--- a/options/gitignore/Composer
+++ b/options/gitignore/Composer
@@ -1,6 +1,6 @@
 composer.phar
 /vendor/
 
-# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
+# Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control
 # You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
 # composer.lock
diff --git a/options/gitignore/CraftCMS b/options/gitignore/CraftCMS
index a70d4772c46..0d81b397e35 100644
--- a/options/gitignore/CraftCMS
+++ b/options/gitignore/CraftCMS
@@ -1,3 +1,4 @@
-# Craft Storage (cache) [http://buildwithcraft.com/help/craft-storage-gitignore]
+# Craft 2 Storage (https://craftcms.com/support/craft-storage-gitignore)
+# not necessary for Craft 3 (https://github.com/craftcms/craft/issues/26)
 /craft/storage/*
-!/craft/storage/logo/*
\ No newline at end of file
+!/craft/storage/rebrand
diff --git a/options/gitignore/Dart b/options/gitignore/Dart
index 4d2a4d6db7c..dbef116d224 100644
--- a/options/gitignore/Dart
+++ b/options/gitignore/Dart
@@ -1,8 +1,8 @@
-# See https://www.dartlang.org/tools/private-files.html
+# See https://www.dartlang.org/guides/libraries/private-files
 
 # Files and directories created by pub
+.dart_tool/
 .packages
-.pub/
 build/
 # If you're building an application, you may want to check-in your pubspec.lock
 pubspec.lock
@@ -10,3 +10,12 @@ pubspec.lock
 # Directory created by dartdoc
 # If you don't generate documentation locally you can remove this line.
 doc/api/
+
+# Avoid committing generated Javascript files:
+*.dart.js
+*.info.json      # Produced by the --dump-info flag.
+*.js             # When generated by dart2js. Don't specify *.js if your
+                 # project includes source files written in JavaScript.
+*.js_
+*.js.deps
+*.js.map
diff --git a/options/gitignore/Delphi b/options/gitignore/Delphi
index 19864c6bbef..9532800ba22 100644
--- a/options/gitignore/Delphi
+++ b/options/gitignore/Delphi
@@ -20,7 +20,7 @@
 # Deployment Manager configuration file for your project. Added in Delphi XE2.
 # Uncomment this if it is not mobile development and you do not use remote debug feature.
 #*.deployproj
-# 
+#
 # C++ object files produced when C/C++ Output file generation is configured.
 # Uncomment this if you are not using external objects (zlib library for example).
 #*.obj
@@ -64,3 +64,6 @@ __recovery/
 
 # Castalia statistics file (since XE7 Castalia is distributed with Delphi)
 *.stat
+
+# Boss dependency manager vendor folder https://github.com/HashLoad/boss
+modules/
diff --git a/options/gitignore/Diff b/options/gitignore/Diff
new file mode 100644
index 00000000000..59491b4440c
--- /dev/null
+++ b/options/gitignore/Diff
@@ -0,0 +1,2 @@
+*.patch
+*.diff
diff --git a/options/gitignore/Drupal b/options/gitignore/Drupal
index 0d2fe537f46..072b683190f 100644
--- a/options/gitignore/Drupal
+++ b/options/gitignore/Drupal
@@ -1,10 +1,12 @@
 # Ignore configuration files that may contain sensitive information.
 sites/*/*settings*.php
+sites/example.sites.php
 
 # Ignore paths that contain generated content.
 files/
 sites/*/files
 sites/*/private
+sites/*/translations
 
 # Ignore default text files
 robots.txt
@@ -16,6 +18,7 @@ robots.txt
 /UPGRADE.txt
 /README.txt
 sites/README.txt
+sites/all/libraries/README.txt
 sites/all/modules/README.txt
 sites/all/themes/README.txt
 
diff --git a/options/gitignore/Eagle b/options/gitignore/Eagle
index 9ced1260266..28f0b9715e6 100644
--- a/options/gitignore/Eagle
+++ b/options/gitignore/Eagle
@@ -4,6 +4,9 @@
 *.s#?
 *.b#?
 *.l#?
+*.b$?
+*.s$?
+*.l$?
 
 # Eagle project file
 # It contains a serial number and references to the file structure
@@ -31,14 +34,18 @@ eagle.epf
 *.drl
 *.gpi
 *.pls
+*.ger
+*.xln
 
 *.drd
 *.drd.*
 
+*.s#*
+*.b#*
+
 *.info
 
 *.eps
 
 # file locks introduced since 7.x
 *.lck
-
diff --git a/options/gitignore/Eclipse b/options/gitignore/Eclipse
index 4f88399d2d8..a65649a9ed2 100644
--- a/options/gitignore/Eclipse
+++ b/options/gitignore/Eclipse
@@ -11,9 +11,6 @@ local.properties
 .loadpath
 .recommenders
 
-# Eclipse Core
-.project
-
 # External tool builders
 .externalToolBuilders/
 
@@ -26,8 +23,8 @@ local.properties
 # CDT-specific (C/C++ Development Tooling)
 .cproject
 
-# JDT-specific (Eclipse Java Development Tools)
-.classpath
+# CDT- autotools
+.autotools
 
 # Java annotation processor (APT)
 .factorypath
@@ -50,6 +47,9 @@ local.properties
 # Code Recommenders
 .recommenders/
 
+# Annotation Processing
+.apt_generated/
+
 # Scala IDE specific (Scala & Java development for Eclipse)
 .cache-main
 .scala_dependencies
diff --git a/options/gitignore/Elixir b/options/gitignore/Elixir
index ac67aaf3243..86e4c3f3905 100644
--- a/options/gitignore/Elixir
+++ b/options/gitignore/Elixir
@@ -1,6 +1,9 @@
 /_build
 /cover
 /deps
+/doc
+/.fetch
 erl_crash.dump
 *.ez
 *.beam
+/config/*.secret.exs
diff --git a/options/gitignore/ExtJs b/options/gitignore/ExtJs
index c92aea0fe0c..ab97a8cc3e1 100644
--- a/options/gitignore/ExtJs
+++ b/options/gitignore/ExtJs
@@ -10,3 +10,5 @@ ext/
 modern.json
 modern.jsonp
 resources/sass/.sass-cache/
+resources/.arch-internal-preview.css
+.arch-internal-preview.css
diff --git a/options/gitignore/Fortran b/options/gitignore/Fortran
index e69de29bb2d..259148fa18f 100644
--- a/options/gitignore/Fortran
+++ b/options/gitignore/Fortran
@@ -0,0 +1,32 @@
+# Prerequisites
+*.d
+
+# Compiled Object files
+*.slo
+*.lo
+*.o
+*.obj
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
+
+# Fortran module files
+*.mod
+*.smod
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app
diff --git a/options/gitignore/GWT b/options/gitignore/GWT
index 07704e54bbc..a01e7fcd921 100644
--- a/options/gitignore/GWT
+++ b/options/gitignore/GWT
@@ -18,9 +18,6 @@ war/WEB-INF/classes/
 #compilation logs
 .gwt/
 
-#caching for already compiled files
-gwt-unitCache/
-
 #gwt junit compilation files
 www-test/
 
diff --git a/options/gitignore/Go b/options/gitignore/Go
index a1338d68517..f1c181ec9c5 100644
--- a/options/gitignore/Go
+++ b/options/gitignore/Go
@@ -1,5 +1,6 @@
 # Binaries for programs and plugins
 *.exe
+*.exe~
 *.dll
 *.so
 *.dylib
@@ -9,6 +10,3 @@
 
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
-
-# Project-local glide cache, RE: https://github.com/Masterminds/glide/issues/736
-.glide/
diff --git a/options/gitignore/Godot b/options/gitignore/Godot
new file mode 100644
index 00000000000..ba45ca4582e
--- /dev/null
+++ b/options/gitignore/Godot
@@ -0,0 +1,8 @@
+
+# Godot-specific ignores
+.import/
+export.cfg
+export_presets.cfg
+
+# Mono-specific ignores
+.mono/
diff --git a/options/gitignore/Haskell b/options/gitignore/Haskell
index 450f32ec40c..82f3a88e17b 100644
--- a/options/gitignore/Haskell
+++ b/options/gitignore/Haskell
@@ -17,4 +17,6 @@ cabal.sandbox.config
 *.eventlog
 .stack-work/
 cabal.project.local
+cabal.project.local~
 .HTF/
+.ghc.environment.*
diff --git a/options/gitignore/Images b/options/gitignore/Images
new file mode 100644
index 00000000000..97dcdbe6a95
--- /dev/null
+++ b/options/gitignore/Images
@@ -0,0 +1,63 @@
+# JPEG
+*.jpg
+*.jpeg
+*.jpe
+*.jif
+*.jfif
+*.jfi
+
+# JPEG 2000
+*.jp2
+*.j2k
+*.jpf
+*.jpx
+*.jpm
+*.mj2
+
+# JPEG XR
+*.jxr
+*.hdp
+*.wdp
+
+# Graphics Interchange Format
+*.gif
+
+# RAW
+*.raw
+
+# Web P
+*.webp
+
+# Portable Network Graphics
+*.png
+
+# Animated Portable Network Graphics
+*.apng
+
+# Multiple-image Network Graphics
+*.mng
+
+# Tagged Image File Format
+*.tiff
+*.tif
+
+# Scalable Vector Graphics
+*.svg
+*.svgz
+
+# Portable Document Format
+*.pdf
+
+# X BitMap
+*.xbm
+
+# BMP
+*.bmp
+*.dib
+
+# ICO
+*.ico
+
+# 3D Images
+*.3dm
+*.max
diff --git a/options/gitignore/JEnv b/options/gitignore/JEnv
new file mode 100644
index 00000000000..d838300ad5e
--- /dev/null
+++ b/options/gitignore/JEnv
@@ -0,0 +1,5 @@
+# JEnv local Java version configuration file
+.java-version
+
+# Used by previous versions of JEnv
+.jenv-version
diff --git a/options/gitignore/Java b/options/gitignore/Java
index 6143e53f9e3..a1c2a238a96 100644
--- a/options/gitignore/Java
+++ b/options/gitignore/Java
@@ -13,6 +13,7 @@
 # Package Files #
 *.jar
 *.war
+*.nar
 *.ear
 *.zip
 *.tar.gz
diff --git a/options/gitignore/Jekyll b/options/gitignore/Jekyll
index 5c91b60c063..2ca868298ce 100644
--- a/options/gitignore/Jekyll
+++ b/options/gitignore/Jekyll
@@ -1,3 +1,4 @@
 _site/
 .sass-cache/
+.jekyll-cache/
 .jekyll-metadata
diff --git a/options/gitignore/JetBrains b/options/gitignore/JetBrains
index a5d4cc86d33..72f4d988a19 100644
--- a/options/gitignore/JetBrains
+++ b/options/gitignore/JetBrains
@@ -1,34 +1,48 @@
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
-# User-specific stuff:
+# User-specific stuff
 .idea/**/workspace.xml
 .idea/**/tasks.xml
-.idea/dictionaries
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
 
-# Sensitive or high-churn files:
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
 .idea/**/dataSources/
 .idea/**/dataSources.ids
-.idea/**/dataSources.xml
 .idea/**/dataSources.local.xml
 .idea/**/sqlDataSources.xml
 .idea/**/dynamic.xml
 .idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
 
-# Gradle:
+# Gradle
 .idea/**/gradle.xml
 .idea/**/libraries
 
-# Mongo Explorer plugin:
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
 .idea/**/mongoSettings.xml
 
-## File-based project format:
+# File-based project format
 *.iws
 
-## Plugin-specific files:
-
 # IntelliJ
-/out/
+out/
 
 # mpeltonen/sbt-idea plugin
 .idea_modules/
@@ -44,3 +58,9 @@ com_crashlytics_export_strings.xml
 crashlytics.properties
 crashlytics-build.properties
 fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
diff --git a/options/gitignore/Joomla b/options/gitignore/Joomla
index 53a74e74657..378c158bddf 100644
--- a/options/gitignore/Joomla
+++ b/options/gitignore/Joomla
@@ -1,4 +1,3 @@
-/.gitignore
 /.htaccess
 /administrator/cache/*
 /administrator/components/com_admin/*
@@ -251,7 +250,7 @@
 /administrator/language/en-GB/en-GB.tpl_hathor.sys.ini
 /administrator/language/en-GB/en-GB.xml
 /administrator/language/overrides/*
-/administrator/logs/index.html
+/administrator/logs/*
 /administrator/manifests/*
 /administrator/modules/mod_custom/*
 /administrator/modules/mod_feed/*
diff --git a/options/gitignore/KiCAD b/options/gitignore/KiCad
similarity index 72%
rename from options/gitignore/KiCAD
rename to options/gitignore/KiCad
index 208bc4fc591..15fdf72ed48 100644
--- a/options/gitignore/KiCAD
+++ b/options/gitignore/KiCad
@@ -1,4 +1,5 @@
 # For PCBs designed using KiCad: http://www.kicad-pcb.org/
+# Format documentation: http://kicad-pcb.org/help/file-formats/
 
 # Temporary files
 *.000
@@ -8,6 +9,9 @@
 *~
 _autosave-*
 *.tmp
+*-rescue.lib
+*-save.pro
+*-save.kicad_pcb
 
 # Netlist files (exported from Eeschema)
 *.net
diff --git a/options/gitignore/Kotlin b/options/gitignore/Kotlin
new file mode 100644
index 00000000000..a1c2a238a96
--- /dev/null
+++ b/options/gitignore/Kotlin
@@ -0,0 +1,23 @@
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
diff --git a/options/gitignore/LabVIEW b/options/gitignore/LabVIEW
index 122450865cf..31619f59814 100644
--- a/options/gitignore/LabVIEW
+++ b/options/gitignore/LabVIEW
@@ -14,3 +14,4 @@
 # Metadata
 *.aliases
 *.lvlps
+.cache/
diff --git a/options/gitignore/Laravel b/options/gitignore/Laravel
index a4854bef534..6552ddf8a06 100644
--- a/options/gitignore/Laravel
+++ b/options/gitignore/Laravel
@@ -1,6 +1,7 @@
-vendor/
+/vendor/
 node_modules/
 npm-debug.log
+yarn-error.log
 
 # Laravel 4 specific
 bootstrap/compiled.php
@@ -10,11 +11,7 @@ app/storage/
 public/storage
 public/hot
 storage/*.key
-.env.*.php
-.env.php
 .env
 Homestead.yaml
 Homestead.json
-
-# Rocketeer PHP task runner and deployment package. https://github.com/rocketeers/rocketeer
-.rocketeer/
+/.vagrant
diff --git a/options/gitignore/Leiningen b/options/gitignore/Leiningen
index a9fe6fba80d..a4cb69a32cc 100644
--- a/options/gitignore/Leiningen
+++ b/options/gitignore/Leiningen
@@ -11,3 +11,4 @@ pom.xml.asc
 .lein-plugins/
 .lein-failures
 .nrepl-port
+.cpcache/
diff --git a/options/gitignore/Magento b/options/gitignore/Magento
index b282f5cf547..abe6d79fedb 100644
--- a/options/gitignore/Magento
+++ b/options/gitignore/Magento
@@ -2,15 +2,44 @@
 # Magento Default Files    #
 #--------------------------#
 
+/PATCH_*.sh
+
 /app/etc/local.xml
+
 /media/*
 !/media/.htaccess
+
+!/media/customer
+/media/customer/*
 !/media/customer/.htaccess
+
+!/media/dhl
+/media/dhl/*
 !/media/dhl/logo.jpg
+
+!/media/downloadable
+/media/downloadable/*
 !/media/downloadable/.htaccess
+
+!/media/xmlconnect
+/media/xmlconnect/*
+
+!/media/xmlconnect/custom
+/media/xmlconnect/custom/*
 !/media/xmlconnect/custom/ok.gif
+
+!/media/xmlconnect/original
+/media/xmlconnect/original/*
 !/media/xmlconnect/original/ok.gif
+
+!/media/xmlconnect/system
+/media/xmlconnect/system/*
 !/media/xmlconnect/system/ok.gif
+
 /var/*
 !/var/.htaccess
+
+!/var/package
+/var/package/*
 !/var/package/*.xml
+
diff --git a/options/gitignore/Matlab b/options/gitignore/Matlab
index 09dfde64b5f..46a83d635ba 100644
--- a/options/gitignore/Matlab
+++ b/options/gitignore/Matlab
@@ -1,8 +1,3 @@
-##---------------------------------------------------
-## Remove autosaves generated by the Matlab editor
-## We have git for backups!
-##---------------------------------------------------
-
 # Windows default autosave extension
 *.asv
 
@@ -12,11 +7,22 @@
 # Compiled MEX binaries (all platforms)
 *.mex*
 
-# Simulink Code Generation
+# Packaged app and toolbox files
+*.mlappinstall
+*.mltbx
+
+# Generated helpsearch folders
+helpsearch*/
+
+# Simulink code generation folders
 slprj/
+sccprj/
 
-# Session info
-octave-workspace
+# Matlab code generation folders
+codegen/
 
 # Simulink autosave extension
-.autosave
+*.autosave
+
+# Octave session info
+octave-workspace
diff --git a/options/gitignore/Maven b/options/gitignore/Maven
index 5f2dbe11df9..e8d57d08088 100644
--- a/options/gitignore/Maven
+++ b/options/gitignore/Maven
@@ -7,6 +7,4 @@ release.properties
 dependency-reduced-pom.xml
 buildNumber.properties
 .mvn/timing.properties
-
-# Avoid ignoring Maven wrapper jar file (.jar files are usually ignored)
-!/.mvn/wrapper/maven-wrapper.jar
+.mvn/wrapper/maven-wrapper.jar
diff --git a/options/gitignore/MicrosoftOffice b/options/gitignore/MicrosoftOffice
index cb891745660..ddcc9cf6e38 100644
--- a/options/gitignore/MicrosoftOffice
+++ b/options/gitignore/MicrosoftOffice
@@ -3,6 +3,9 @@
 # Word temporary
 ~$*.doc*
 
+# Word Auto Backup File
+Backup of *.doc*
+
 # Excel temporary
 ~$*.xls*
 
@@ -13,4 +16,4 @@
 ~$*.ppt*
 
 # Visio autosave temporary files
-*.~vsdx
+*.~vsd*
diff --git a/options/gitignore/Nanoc b/options/gitignore/Nanoc
index 3f36ea2a878..6f35daaf478 100644
--- a/options/gitignore/Nanoc
+++ b/options/gitignore/Nanoc
@@ -4,7 +4,7 @@
 output/
 
 # Temporary file directory
-tmp/
+tmp/nanoc/
 
 # Crash Log
 crash.log
diff --git a/options/gitignore/NetBeans b/options/gitignore/NetBeans
index 254108cd23b..863bc7fa66e 100644
--- a/options/gitignore/NetBeans
+++ b/options/gitignore/NetBeans
@@ -1,4 +1,4 @@
-nbproject/private/
+**/nbproject/private/
 build/
 nbbuild/
 dist/
diff --git a/options/gitignore/Node b/options/gitignore/Node
index 00cbbdf53f6..e1da6ae8ea5 100644
--- a/options/gitignore/Node
+++ b/options/gitignore/Node
@@ -20,7 +20,7 @@ coverage
 # nyc test coverage
 .nyc_output
 
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
 .grunt
 
 # Bower dependency directory (https://bower.io/)
@@ -29,14 +29,14 @@ bower_components
 # node-waf configuration
 .lock-wscript
 
-# Compiled binary addons (http://nodejs.org/api/addons.html)
+# Compiled binary addons (https://nodejs.org/api/addons.html)
 build/Release
 
 # Dependency directories
 node_modules/
 jspm_packages/
 
-# Typescript v1 declaration files
+# TypeScript v1 declaration files
 typings/
 
 # Optional npm cache directory
@@ -57,3 +57,20 @@ typings/
 # dotenv environment variables file
 .env
 
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+
+# next.js build output
+.next
+
+# nuxt.js build output
+.nuxt
+
+# vuepress build output
+.vuepress/dist
+
+# Serverless directories
+.serverless
+
+# FuseBox cache
+.fusebox/
diff --git a/options/gitignore/OCaml b/options/gitignore/OCaml
index f7817ae5c36..da0b20424a0 100644
--- a/options/gitignore/OCaml
+++ b/options/gitignore/OCaml
@@ -18,3 +18,6 @@ _build/
 # oasis generated files
 setup.data
 setup.log
+
+# Merlin configuring file for Vim and Emacs
+.merlin
diff --git a/options/gitignore/Objective-C b/options/gitignore/Objective-C
index 09dfede4814..a0bd6b453a8 100644
--- a/options/gitignore/Objective-C
+++ b/options/gitignore/Objective-C
@@ -35,6 +35,9 @@ xcuserdata/
 # https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
 #
 # Pods/
+#
+# Add this line if you want to avoid checking in source code from the Xcode workspace
+# *.xcworkspace
 
 # Carthage
 #
@@ -52,7 +55,7 @@ Carthage/Build
 
 fastlane/report.xml
 fastlane/Preview.html
-fastlane/screenshots
+fastlane/screenshots/**/*.png
 fastlane/test_output
 
 # Code Injection
diff --git a/options/gitignore/PSoCCreator b/options/gitignore/PSoCCreator
new file mode 100644
index 00000000000..15ae040bcda
--- /dev/null
+++ b/options/gitignore/PSoCCreator
@@ -0,0 +1,18 @@
+# Project Settings
+*.cywrk.*
+*.cyprj.*
+
+# Generated Assets and Resources
+Debug/
+Release/
+Export/
+*/codegentemp
+*/Generated_Source
+*_datasheet.pdf
+*_timing.html
+*.cycdx
+*.cyfit
+*.rpt
+*.svd
+*.log
+*.zip
diff --git a/options/gitignore/Patch b/options/gitignore/Patch
new file mode 100644
index 00000000000..6ffab9ad295
--- /dev/null
+++ b/options/gitignore/Patch
@@ -0,0 +1,2 @@
+*.orig
+*.rej
diff --git a/options/gitignore/Perl b/options/gitignore/Perl
index 9bf1537f6ae..ecf66f84291 100644
--- a/options/gitignore/Perl
+++ b/options/gitignore/Perl
@@ -24,7 +24,7 @@ Build.bat
 # Module::Install
 inc/
 
-# ExtUitls::MakeMaker
+# ExtUtils::MakeMaker
 /blib/
 /_eumm/
 /*.gz
diff --git a/options/gitignore/Perl6 b/options/gitignore/Perl6
new file mode 100644
index 00000000000..7b2c018a562
--- /dev/null
+++ b/options/gitignore/Perl6
@@ -0,0 +1,7 @@
+# Gitignore for Perl 6 (http://www.perl6.org)
+# As part of https://github.com/github/gitignore
+
+# precompiled files
+.precomp
+lib/.precomp
+
diff --git a/options/gitignore/Prestashop b/options/gitignore/Prestashop
index 7c6ae1e31cc..81f45e19eba 100644
--- a/options/gitignore/Prestashop
+++ b/options/gitignore/Prestashop
@@ -7,8 +7,10 @@ config/settings.*.php
 # The following files are generated by PrestaShop.
 
 admin-dev/autoupgrade/
-/cache/
+/cache/*
 !/cache/index.php
+!/cache/*/
+/cache/*/*
 !/cache/cachefs/index.php
 !/cache/purifier/index.php
 !/cache/push/index.php
diff --git a/options/gitignore/Processing b/options/gitignore/Processing
index 85f269a89f6..333c0e0890a 100644
--- a/options/gitignore/Processing
+++ b/options/gitignore/Processing
@@ -1,5 +1,7 @@
 .DS_Store
 applet
+application.linux-arm64
+application.linux-armv6hf
 application.linux32
 application.linux64
 application.windows32
diff --git a/options/gitignore/Python b/options/gitignore/Python
index 62c1e736924..510c73d0fdb 100644
--- a/options/gitignore/Python
+++ b/options/gitignore/Python
@@ -8,7 +8,6 @@ __pycache__/
 
 # Distribution / packaging
 .Python
-env/
 build/
 develop-eggs/
 dist/
@@ -24,6 +23,7 @@ wheels/
 *.egg-info/
 .installed.cfg
 *.egg
+MANIFEST
 
 # PyInstaller
 #  Usually these files are written by a python script from a template
@@ -38,13 +38,15 @@ pip-delete-this-directory.txt
 # Unit test / coverage reports
 htmlcov/
 .tox/
+.nox/
 .coverage
 .coverage.*
 .cache
 nosetests.xml
 coverage.xml
-*,cover
+*.cover
 .hypothesis/
+.pytest_cache/
 
 # Translations
 *.mo
@@ -53,6 +55,7 @@ coverage.xml
 # Django stuff:
 *.log
 local_settings.py
+db.sqlite3
 
 # Flask stuff:
 instance/
@@ -70,6 +73,10 @@ target/
 # Jupyter Notebook
 .ipynb_checkpoints
 
+# IPython
+profile_default/
+ipython_config.py
+
 # pyenv
 .python-version
 
@@ -79,16 +86,29 @@ celerybeat-schedule
 # SageMath parsed files
 *.sage.py
 
-# dotenv
+# Environments
 .env
-
-# virtualenv
 .venv
+env/
 venv/
 ENV/
+env.bak/
+venv.bak/
 
 # Spyder project settings
 .spyderproject
+.spyproject
 
 # Rope project settings
 .ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
diff --git a/options/gitignore/Qt b/options/gitignore/Qt
index c7659c24f38..5291a385b25 100644
--- a/options/gitignore/Qt
+++ b/options/gitignore/Qt
@@ -1,5 +1,4 @@
 # C++ objects and libs
-
 *.slo
 *.lo
 *.o
@@ -11,7 +10,9 @@
 *.dylib
 
 # Qt-es
-
+object_script.*.Release
+object_script.*.Debug
+*_plugin_import.cpp
 /.qmake.cache
 /.qmake.stash
 *.pro.user
@@ -20,19 +21,23 @@
 *.qbs.user.*
 *.moc
 moc_*.cpp
+moc_*.h
 qrc_*.cpp
 ui_*.h
+*.qmlc
+*.jsc
 Makefile*
 *build-*
 
-# QtCreator
+# Qt unit tests
+target_wrapper.*
 
+# QtCreator
 *.autosave
 
-# QtCtreator Qml
+# QtCreator Qml
 *.qmlproject.user
 *.qmlproject.user.*
 
-# QtCtreator CMake
+# QtCreator CMake
 CMakeLists.txt.user*
-
diff --git a/options/gitignore/R b/options/gitignore/R
index fcff087aebb..26fad6fadff 100644
--- a/options/gitignore/R
+++ b/options/gitignore/R
@@ -31,3 +31,6 @@ vignettes/*.pdf
 # Temporary files created by R markdown
 *.utf8.md
 *.knit.md
+
+# Shiny token, see https://shiny.rstudio.com/articles/shinyapps.html
+rsconnect/
diff --git a/options/gitignore/ROS b/options/gitignore/ROS
index f8bcd117371..35d74bb771f 100644
--- a/options/gitignore/ROS
+++ b/options/gitignore/ROS
@@ -1,3 +1,5 @@
+devel/
+logs/
 build/
 bin/
 lib/
@@ -11,6 +13,8 @@ msg/*Feedback.msg
 msg/*Goal.msg
 msg/*Result.msg
 msg/_*.py
+build_isolated/
+devel_isolated/
 
 # Generated by dynamic reconfigure
 *.cfgc
diff --git a/options/gitignore/Rails b/options/gitignore/Rails
index e97427608c1..38ba1b5b38c 100644
--- a/options/gitignore/Rails
+++ b/options/gitignore/Rails
@@ -8,12 +8,13 @@ capybara-*.html
 /public/system
 /coverage/
 /spec/tmp
-**.orig
+*.orig
 rerun.txt
 pickle-email-*.html
 
 # TODO Comment out this rule if you are OK with secrets being uploaded to the repo
 config/initializers/secret_token.rb
+config/master.key
 
 # Only include if you have production secrets in this file, which is no longer a Rails default
 # config/secrets.yml
@@ -42,3 +43,20 @@ bower.json
 
 # Ignore Byebug command history file.
 .byebug_history
+
+# Ignore node_modules
+node_modules/
+
+# Ignore precompiled javascript packs
+/public/packs
+/public/packs-test
+/public/assets
+
+# Ignore yarn files
+/yarn-error.log
+yarn-debug.log*
+.yarn-integrity
+
+# Ignore uploaded files in development
+/storage/*
+!/storage/.keep
\ No newline at end of file
diff --git a/options/gitignore/Rust b/options/gitignore/Rust
index 50281a44270..088ba6ba7d3 100644
--- a/options/gitignore/Rust
+++ b/options/gitignore/Rust
@@ -3,7 +3,7 @@
 /target/
 
 # Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
-# More information here http://doc.crates.io/guide.html#cargotoml-vs-cargolock
+# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
 Cargo.lock
 
 # These are backup files generated by rustfmt
diff --git a/options/gitignore/Sass b/options/gitignore/Sass
index 486b32ce90c..159f515170b 100644
--- a/options/gitignore/Sass
+++ b/options/gitignore/Sass
@@ -1,2 +1,4 @@
 .sass-cache/
 *.css.map
+*.sass.map
+*.scss.map
diff --git a/options/gitignore/Smalltalk b/options/gitignore/Smalltalk
index 75272b23472..943995e1172 100644
--- a/options/gitignore/Smalltalk
+++ b/options/gitignore/Smalltalk
@@ -13,6 +13,10 @@ SqueakDebug.log
 # Monticello package cache
 /package-cache
 
+# playground cache
+/play-cache
+/play-stash
+
 # Metacello-github cache
 /github-cache
 github-*.zip
diff --git a/options/gitignore/SublimeText b/options/gitignore/SublimeText
index 95ff2244c99..86c3fa455aa 100644
--- a/options/gitignore/SublimeText
+++ b/options/gitignore/SublimeText
@@ -1,16 +1,16 @@
-# cache files for sublime text
+# Cache files for Sublime Text
 *.tmlanguage.cache
 *.tmPreferences.cache
 *.stTheme.cache
 
-# workspace files are user-specific
+# Workspace files are user-specific
 *.sublime-workspace
 
-# project files should be checked into the repository, unless a significant
-# proportion of contributors will probably not be using SublimeText
+# Project files should be checked into the repository, unless a significant
+# proportion of contributors will probably not be using Sublime Text
 # *.sublime-project
 
-# sftp configuration file
+# SFTP configuration file
 sftp-config.json
 
 # Package control specific files
diff --git a/options/gitignore/SugarCRM b/options/gitignore/SugarCRM
index e9270205fd5..6a183d1c748 100644
--- a/options/gitignore/SugarCRM
+++ b/options/gitignore/SugarCRM
@@ -6,7 +6,7 @@
 # the misuse of the repository as backup replacement.
 # For development the cache directory can be safely ignored and
 # therefore it is ignored.
-/cache/
+/cache/*
 !/cache/index.html
 # Ignore some files and directories from the custom directory.
 /custom/history/
@@ -22,6 +22,6 @@
 # Logs files can safely be ignored.
 *.log
 # Ignore the new upload directories.
-/upload/
+/upload/*
 !/upload/index.html
 /upload_backup/
diff --git a/options/gitignore/Swift b/options/gitignore/Swift
index d5340449396..7b0d62bc23a 100644
--- a/options/gitignore/Swift
+++ b/options/gitignore/Swift
@@ -37,6 +37,7 @@ playground.xcworkspace
 # Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
 # Packages/
 # Package.pins
+# Package.resolved
 .build/
 
 # CocoaPods
@@ -46,6 +47,9 @@ playground.xcworkspace
 # https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
 #
 # Pods/
+#
+# Add this line if you want to avoid checking in source code from the Xcode workspace
+# *.xcworkspace
 
 # Carthage
 #
@@ -63,5 +67,12 @@ Carthage/Build
 
 fastlane/report.xml
 fastlane/Preview.html
-fastlane/screenshots
+fastlane/screenshots/**/*.png
 fastlane/test_output
+
+# Code Injection
+#
+# After new code Injection tools there's a generated folder /iOSInjectionProject
+# https://github.com/johnno1962/injectionforxcode
+
+iOSInjectionProject/
diff --git a/options/gitignore/Symfony b/options/gitignore/Symfony
index 6c224e024e9..3dab634c188 100644
--- a/options/gitignore/Symfony
+++ b/options/gitignore/Symfony
@@ -15,6 +15,10 @@
 !var/logs/.gitkeep
 !var/sessions/.gitkeep
 
+# Logs (Symfony4)
+/var/log/*
+!var/log/.gitkeep
+
 # Parameters
 /app/config/parameters.yml
 /app/config/parameters.ini
@@ -25,6 +29,7 @@
 /bin/*
 !bin/console
 !bin/symfony_requirements
+/vendor/
 
 # Assets and user uploads
 /web/bundles/
@@ -37,5 +42,11 @@
 # Build data
 /build/
 
+# Composer PHAR
+/composer.phar
+
 # Backup entities generated with doctrine:generate:entities command
 **/Entity/*~
+
+# Embedded web-server pid file
+/.web-server-pid
diff --git a/options/gitignore/SynopsysVCS b/options/gitignore/SynopsysVCS
index eed2432fb78..ad751f6bd75 100644
--- a/options/gitignore/SynopsysVCS
+++ b/options/gitignore/SynopsysVCS
@@ -4,8 +4,8 @@
 *.evcd
 *.fsdb
 
-# Default name of the simulation executable.  A different name can be 
-# specified with this switch (the associated daidir database name is 
+# Default name of the simulation executable.  A different name can be
+# specified with this switch (the associated daidir database name is
 # also taken from here):  -o <path>/<filename>
 simv
 
@@ -13,7 +13,7 @@ simv
 simv.daidir/
 simv.db.dir/
 
-# Infrastructure necessary to co-simulate SystemC models with 
+# Infrastructure necessary to co-simulate SystemC models with
 # Verilog/VHDL models.  An alternate directory may be specified with this
 # switch:  -Mdir=<directory_path>
 csrc/
@@ -22,7 +22,7 @@ csrc/
 # used to write all messages from simulation:  -l <filename>
 *.log
 
-# Coverage results (generated with urg) and database location.  The 
+# Coverage results (generated with urg) and database location.  The
 # following switch can also be used:  urg -dir <coverage_directory>.vdb
 simv.vdb/
 urgReport/
diff --git a/options/gitignore/TeX b/options/gitignore/TeX
index 57ed9f5d972..753f2b954ff 100644
--- a/options/gitignore/TeX
+++ b/options/gitignore/TeX
@@ -10,9 +10,11 @@
 *.fot
 *.cb
 *.cb2
+.*.lb
 
 ## Intermediate documents:
 *.dvi
+*.xdv
 *-converted-to.*
 # these rules might exclude image files for figures etc.
 # *.ps
@@ -38,6 +40,10 @@
 *.synctex.gz(busy)
 *.pdfsync
 
+## Build tool directories for auxiliary files
+# latexrun
+latex.out/
+
 ## Auxiliary and intermediate files from other packages:
 # algorithms
 *.alg
@@ -58,6 +64,9 @@ acs-*.bib
 # changes
 *.soc
 
+# comment
+*.cut
+
 # cprotect
 *.cpt
 
@@ -108,6 +117,14 @@ acs-*.bib
 *.gaux
 *.gtex
 
+# htlatex
+*.4ct
+*.4tc
+*.idv
+*.lg
+*.trc
+*.xref
+
 # hyperref
 *.brf
 
@@ -143,11 +160,16 @@ _minted*
 *.mw
 
 # nomencl
+*.nlg
 *.nlo
+*.nls
 
 # pax
 *.pax
 
+# pdfpcnotes
+*.pdfpc
+
 # sagetex
 *.sagetex.sage
 *.sagetex.py
@@ -169,6 +191,9 @@ sympy-plots-for-*.tex/
 *.pytxcode
 pythontex-files-*/
 
+# tcolorbox
+*.listing
+
 # thmtools
 *.loe
 
@@ -183,6 +208,12 @@ pythontex-files-*/
 # easy-todo
 *.lod
 
+# xcolor
+*.xcp
+
+# xmpincl
+*.xmpi
+
 # xindy
 *.xdy
 
@@ -204,6 +235,9 @@ TSWLatexianTemp*
 # Texpad
 .texpadtmp
 
+# LyX
+*.lyx~
+
 # Kile
 *.backup
 
@@ -211,7 +245,11 @@ TSWLatexianTemp*
 *~[0-9]*
 
 # auto folder when using emacs and auctex
-/auto/*
+./auto/*
+*.el
 
 # expex forward references with \gathertags
 *-tags.tex
+
+# standalone packages
+*.sta
diff --git a/options/gitignore/Terraform b/options/gitignore/Terraform
index 41859c81f1c..a8935803468 100644
--- a/options/gitignore/Terraform
+++ b/options/gitignore/Terraform
@@ -1,6 +1,26 @@
-# Compiled files
+# Local .terraform directories
+**/.terraform/*
+
+# .tfstate files
 *.tfstate
-*.tfstate.backup
+*.tfstate.*
+
+# Crash log files
+crash.log
+
+# Ignore any .tfvars files that are generated automatically for each Terraform run. Most
+# .tfvars files are managed as part of configuration and so should be included in
+# version control.
+#
+# example.tfvars
+
+# Ignore override files as they are usually used to override resources locally and so
+# are not checked in
+override.tf
+override.tf.json
+*_override.tf
+*_override.tf.json
 
-# Module directory
-.terraform/
+# Include override files you do wish to add to version control using negated pattern
+#
+# !example_override.tf
diff --git a/options/gitignore/Typo3 b/options/gitignore/Typo3
index cb024fefe99..200c2a2bf79 100644
--- a/options/gitignore/Typo3
+++ b/options/gitignore/Typo3
@@ -8,12 +8,15 @@
 /typo3conf/temp_CACHED*
 /typo3conf/temp_fieldInfo.php
 /typo3conf/deprecation_*.log
-/typo3conf/AdditionalConfiguration.php
+/typo3conf/ENABLE_INSTALL_TOOL
+/typo3conf/realurl_autoconf.php
+/FIRST_INSTALL
 # Ignore system folders, you should have them symlinked.
 # If not comment out the following entries.
 /typo3
 /typo3_src
 /typo3_src-*
+/Packages
 /.htaccess
 /index.php
 # Ignore temp directory.
diff --git a/options/gitignore/Umbraco b/options/gitignore/Umbraco
index ea05e1fb2a9..cd90af3071a 100644
--- a/options/gitignore/Umbraco
+++ b/options/gitignore/Umbraco
@@ -1,3 +1,7 @@
+## Ignore Umbraco files/folders generated for each instance
+##
+## Get latest from https://github.com/github/gitignore/blob/master/Umbraco.gitignore
+
 # Note: VisualStudio gitignore rules may also be relevant
 
 # Umbraco
@@ -12,8 +16,11 @@
 
 # Don't ignore Umbraco packages (VisualStudio.gitignore mistakes this for a NuGet packages folder)
 # Make sure to include details from VisualStudio.gitignore BEFORE this
-!**/App_Data/[Pp]ackages/
-!**/[Uu]mbraco/[Dd]eveloper/[Pp]ackages
+!**/App_Data/[Pp]ackages/*
+!**/[Uu]mbraco/[Dd]eveloper/[Pp]ackages/*
 
-# ImageProcessor DiskCache 
+# ImageProcessor DiskCache
 **/App_Data/cache/
+
+# Ignore the Models Builder models out of date flag
+**/App_Data/Models/ood.flag
diff --git a/options/gitignore/Unity b/options/gitignore/Unity
index eb83a8f122d..833e6d4291c 100644
--- a/options/gitignore/Unity
+++ b/options/gitignore/Unity
@@ -1,12 +1,12 @@
-/[Ll]ibrary/
-/[Tt]emp/
-/[Oo]bj/
-/[Bb]uild/
-/[Bb]uilds/
-/Assets/AssetStoreTools*
+[Ll]ibrary/
+[Tt]emp/
+[Oo]bj/
+[Bb]uild/
+[Bb]uilds/
+Assets/AssetStoreTools*
 
-# Visual Studio 2015 cache directory
-/.vs/
+# Visual Studio cache directory
+.vs/
 
 # Autogenerated VS/MD/Consulo solution and project files
 ExportedObj/
@@ -22,9 +22,12 @@ ExportedObj/
 *.booproj
 *.svd
 *.pdb
+*.opendb
+*.VC.db
 
 # Unity3D generated meta files
 *.pidb.meta
+*.pdb.meta
 
 # Unity3D Generated File On Crash Reports
 sysinfo.txt
diff --git a/options/gitignore/UnrealEngine b/options/gitignore/UnrealEngine
index 2f096001fec..6582eaf9a11 100644
--- a/options/gitignore/UnrealEngine
+++ b/options/gitignore/UnrealEngine
@@ -1,9 +1,6 @@
 # Visual Studio 2015 user specific files
 .vs/
 
-# Visual Studio 2015 database file
-*.VC.db
-
 # Compiled Object files
 *.slo
 *.lo
@@ -50,10 +47,16 @@ SourceArt/**/*.tga
 
 # Binary Files
 Binaries/*
+Plugins/*/Binaries/*
 
 # Builds
 Build/*
 
+# Whitelist PakBlacklist-<BuildConfiguration>.txt files
+!Build/*/
+Build/*/**
+!Build/*/PakBlacklist*.txt
+
 # Don't ignore icon files in Build
 !Build/**/*.ico
 
@@ -65,6 +68,7 @@ Saved/*
 
 # Compiled source files for the engine to use
 Intermediate/*
+Plugins/*/Intermediate/*
 
 # Cache files for the editor to use
 DerivedDataCache/*
diff --git a/options/gitignore/Vagrant b/options/gitignore/Vagrant
index a977916f658..93987ca00ec 100644
--- a/options/gitignore/Vagrant
+++ b/options/gitignore/Vagrant
@@ -1 +1,5 @@
+# General
 .vagrant/
+
+# Log files (if you are creating logs in debug mode, uncomment this)
+# *.logs
diff --git a/options/gitignore/Vim b/options/gitignore/Vim
index 42e7afc1005..741518ffd24 100644
--- a/options/gitignore/Vim
+++ b/options/gitignore/Vim
@@ -1,12 +1,17 @@
-# swap
+# Swap
 [._]*.s[a-v][a-z]
 [._]*.sw[a-p]
-[._]s[a-v][a-z]
+[._]s[a-rt-v][a-z]
+[._]ss[a-gi-z]
 [._]sw[a-p]
-# session
+
+# Session
 Session.vim
-# temporary
+
+# Temporary
 .netrwhist
 *~
-# auto-generated tag files
+# Auto-generated tag files
 tags
+# Persistent undo
+[._]*.un~
diff --git a/options/gitignore/VisualStudio b/options/gitignore/VisualStudio
index a752eacca7d..4d13c54854e 100644
--- a/options/gitignore/VisualStudio
+++ b/options/gitignore/VisualStudio
@@ -4,6 +4,7 @@
 ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
 
 # User-specific files
+*.rsuser
 *.suo
 *.user
 *.userosscache
@@ -24,11 +25,14 @@ bld/
 [Oo]bj/
 [Ll]og/
 
-# Visual Studio 2015 cache/options directory
+# Visual Studio 2015/2017 cache/options directory
 .vs/
 # Uncomment if you have tasks that create the project's static files in wwwroot
 #wwwroot/
 
+# Visual Studio 2017 auto generated files
+Generated\ Files/
+
 # MSTest test Results
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
@@ -42,20 +46,28 @@ TestResult.xml
 [Rr]eleasePS/
 dlldata.c
 
+# Benchmark Results
+BenchmarkDotNet.Artifacts/
+
 # .NET Core
 project.lock.json
 project.fragment.lock.json
 artifacts/
-**/Properties/launchSettings.json
 
+# StyleCop
+StyleCopReport.xml
+
+# Files built by Visual Studio
 *_i.c
 *_p.c
-*_i.h
+*_h.h
 *.ilk
 *.meta
 *.obj
+*.iobj
 *.pch
 *.pdb
+*.ipdb
 *.pgc
 *.pgd
 *.rsp
@@ -65,6 +77,7 @@ artifacts/
 *.tlh
 *.tmp
 *.tmp_proj
+*_wpftmp.csproj
 *.log
 *.vspscc
 *.vssscc
@@ -93,6 +106,9 @@ ipch/
 *.vspx
 *.sap
 
+# Visual Studio Trace Files
+*.e2e
+
 # TFS 2012 Local Workspace
 $tf/
 
@@ -113,6 +129,10 @@ _TeamCity*
 # DotCover is a Code Coverage Tool
 *.dotCover
 
+# AxoCover is a Code Coverage Tool
+.axoCover/*
+!.axoCover/settings.json
+
 # Visual Studio code coverage results
 *.coverage
 *.coveragexml
@@ -148,7 +168,7 @@ publish/
 # Publish Web Output
 *.[Pp]ublish.xml
 *.azurePubxml
-# TODO: Comment the next line if you want to checkin your web deploy settings
+# Note: Comment the next line if you want to checkin your web deploy settings,
 # but database connection strings (with potential passwords) will be unencrypted
 *.pubxml
 *.publishproj
@@ -161,11 +181,11 @@ PublishScripts/
 # NuGet Packages
 *.nupkg
 # The packages folder can be ignored because of Package Restore
-**/packages/*
+**/[Pp]ackages/*
 # except build/, which is used as an MSBuild target.
-!**/packages/build/
+!**/[Pp]ackages/build/
 # Uncomment if necessary however generally it will be regenerated when needed
-#!**/packages/repositories.config
+#!**/[Pp]ackages/repositories.config
 # NuGet v3's project.json files produces more ignorable files
 *.nuget.props
 *.nuget.targets
@@ -183,6 +203,7 @@ AppPackages/
 BundleArtifacts/
 Package.StoreAssociation.xml
 _pkginfo.txt
+*.appx
 
 # Visual Studio cache files
 # files ending in .cache can be ignored
@@ -201,6 +222,10 @@ ClientBin/
 *.publishsettings
 orleans.codegen.cs
 
+# Including strong name files can present a security risk
+# (https://github.com/github/gitignore/pull/2483#issue-259490424)
+#*.snk
+
 # Since there are multiple workflows, uncomment next line to ignore bower_components
 # (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
 #bower_components/
@@ -215,15 +240,19 @@ _UpgradeReport_Files/
 Backup*/
 UpgradeLog*.XML
 UpgradeLog*.htm
+ServiceFabricBackup/
+*.rptproj.bak
 
 # SQL Server files
 *.mdf
 *.ldf
+*.ndf
 
 # Business Intelligence projects
 *.rdl.data
 *.bim.layout
 *.bim_*.settings
+*.rptproj.rsuser
 
 # Microsoft Fakes
 FakesAssemblies/
@@ -235,9 +264,6 @@ FakesAssemblies/
 .ntvs_analysis.dat
 node_modules/
 
-# Typescript v1 declaration files
-typings/
-
 # Visual Studio 6 build log
 *.plg
 
@@ -266,8 +292,8 @@ paket-files/
 .idea/
 *.sln.iml
 
-# CodeRush
-.cr/
+# CodeRush personal settings
+.cr/personal
 
 # Python Tools for Visual Studio (PTVS)
 __pycache__/
@@ -277,6 +303,9 @@ __pycache__/
 # tools/**
 # !tools/packages.config
 
+# Tabs Studio
+*.tss
+
 # Telerik's JustMock configuration file
 *.jmconfig
 
@@ -284,4 +313,22 @@ __pycache__/
 *.btp.cs
 *.btm.cs
 *.odx.cs
-*.xsd.cs
\ No newline at end of file
+*.xsd.cs
+
+# OpenCover UI analysis results
+OpenCover/
+
+# Azure Stream Analytics local run output
+ASALocalRun/
+
+# MSBuild Binary and Structured Log
+*.binlog
+
+# NVidia Nsight GPU debugger configuration file
+*.nvuser
+
+# MFractors (Xamarin productivity tool) working folder
+.mfractor/
+
+# Local History for Visual Studio
+.localhistory/
diff --git a/options/gitignore/Windows b/options/gitignore/Windows
index ba26afd9653..0251dd21ad8 100644
--- a/options/gitignore/Windows
+++ b/options/gitignore/Windows
@@ -3,8 +3,11 @@ Thumbs.db
 ehthumbs.db
 ehthumbs_vista.db
 
+# Dump file
+*.stackdump
+
 # Folder config file
-Desktop.ini
+[Dd]esktop.ini
 
 # Recycle Bin used on file shares
 $RECYCLE.BIN/
@@ -12,6 +15,7 @@ $RECYCLE.BIN/
 # Windows Installer files
 *.cab
 *.msi
+*.msix
 *.msm
 *.msp
 
diff --git a/options/gitignore/WordPress b/options/gitignore/WordPress
index 97923503c4c..3b181ec0cf2 100644
--- a/options/gitignore/WordPress
+++ b/options/gitignore/WordPress
@@ -7,6 +7,7 @@ wp-content/blogs.dir/
 wp-content/cache/
 wp-content/upgrade/
 wp-content/uploads/
+wp-content/mu-plugins/
 wp-content/wp-cache-config.php
 wp-content/plugins/hello.php
 
diff --git a/options/gitignore/Xcode b/options/gitignore/Xcode
index 37de8bb4793..b01314d3a64 100644
--- a/options/gitignore/Xcode
+++ b/options/gitignore/Xcode
@@ -21,3 +21,59 @@ xcuserdata/
 *.moved-aside
 *.xccheckout
 *.xcscmblueprint
+
+## Obj-C/Swift specific
+*.hmap
+*.ipa
+*.dSYM.zip
+*.dSYM
+
+## Playgrounds
+timeline.xctimeline
+playground.xcworkspace
+
+# Swift Package Manager
+#
+# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
+# Packages/
+# Package.pins
+# Package.resolved
+.build/
+
+# CocoaPods
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+#
+# Pods/
+#
+# Add this line if you want to avoid checking in source code from the Xcode workspace
+# *.xcworkspace
+
+# Carthage
+#
+# Add this line if you want to avoid checking in source code from Carthage dependencies.
+# Carthage/Checkouts
+
+Carthage/Build
+
+# fastlane
+#
+# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
+# screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://docs.fastlane.tools/best-practices/source-control/#source-control
+
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots/**/*.png
+fastlane/test_output
+
+# Code Injection
+#
+# After new code Injection tools there's a generated folder /iOSInjectionProject
+# https://github.com/johnno1962/injectionforxcode
+
+iOSInjectionProject/
+
diff --git a/options/gitignore/ZendFramework b/options/gitignore/ZendFramework
index 80adb154900..f0b7d8585b7 100644
--- a/options/gitignore/ZendFramework
+++ b/options/gitignore/ZendFramework
@@ -19,7 +19,6 @@ temp/
 data/DoctrineORMModule/Proxy/
 data/DoctrineORMModule/cache/
 
-
 # Legacy ZF1
 demos/
 extras/documentation
diff --git a/options/gitignore/macOS b/options/gitignore/macOS
index f0f3fbc06c8..135767fc075 100644
--- a/options/gitignore/macOS
+++ b/options/gitignore/macOS
@@ -1,26 +1,26 @@
-*.DS_Store
-.AppleDouble
-.LSOverride
-
-# Icon must end with two \r
-Icon
-
-
-# Thumbnails
-._*
-
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-.com.apple.timemachine.donotpresent
-
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon

+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
diff --git a/scripts/generate-gitignores.go b/scripts/generate-gitignores.go
index a169fc0242a..0f56ff3a897 100644
--- a/scripts/generate-gitignores.go
+++ b/scripts/generate-gitignores.go
@@ -59,6 +59,8 @@ func main() {
 
 	tr := tar.NewReader(gz)
 
+	filesToCopy := make(map[string]string, 0)
+
 	for {
 		hdr, err := tr.Next()
 
@@ -74,6 +76,12 @@ func main() {
 			continue
 		}
 
+		if hdr.Typeflag == tar.TypeSymlink {
+			fmt.Printf("Found symlink %s -> %s\n", hdr.Name, hdr.Linkname)
+			filesToCopy[strings.TrimSuffix(filepath.Base(hdr.Name), ".gitignore")] = strings.TrimSuffix(filepath.Base(hdr.Linkname), ".gitignore")
+			continue
+		}
+
 		out, err := os.Create(path.Join(destination, strings.TrimSuffix(filepath.Base(hdr.Name), ".gitignore")))
 
 		if err != nil {
@@ -89,5 +97,21 @@ func main() {
 		}
 	}
 
+	for dst, src := range filesToCopy {
+		// Read all content of src to data
+		src = path.Join(destination, src)
+		data, err := ioutil.ReadFile(src)
+		if err != nil {
+			log.Fatalf("Failed to read src file. %s", err)
+		}
+		// Write data to dst
+		dst = path.Join(destination, dst)
+		err = ioutil.WriteFile(dst, data, 0644)
+		if err != nil {
+			log.Fatalf("Failed to write new file. %s", err)
+		}
+		fmt.Printf("Written (copy of %s) %s\n", src, dst)
+	}
+
 	fmt.Println("Done")
 }