diff --git a/.gitmodules b/.gitmodules
index d1a4d9d1..551b9450 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -710,6 +710,9 @@
 [submodule "vendor/grammars/language-graphql"]
 	path = vendor/grammars/language-graphql
 	url = https://github.com/rmosolgo/language-graphql
+[submodule "vendor/grammars/language-toc-wow"]
+	path = vendor/grammars/language-toc-wow
+	url = https://github.com/nebularg/language-toc-wow
 [submodule "vendor/grammars/sublime-autoit"]
 	path = vendor/grammars/sublime-autoit
 	url = https://github.com/AutoIt/SublimeAutoItScript
diff --git a/grammars.yml b/grammars.yml
index 27193028..90c6ebcf 100755
--- a/grammars.yml
+++ b/grammars.yml
@@ -124,7 +124,6 @@ vendor/grammars/SublimeBrainfuck:
 vendor/grammars/SublimeClarion/:
 - source.clarion
 vendor/grammars/SublimePapyrus/:
-- source.papyrus.fallout4
 - source.papyrus.skyrim
 vendor/grammars/SublimePuppet/:
 - source.puppet
@@ -372,6 +371,8 @@ vendor/grammars/language-shellscript:
 - text.shell-session
 vendor/grammars/language-supercollider:
 - source.supercollider
+vendor/grammars/language-toc-wow:
+- source.toc
 vendor/grammars/language-xbase:
 - source.harbour
 vendor/grammars/language-yaml:
diff --git a/lib/linguist/heuristics.rb b/lib/linguist/heuristics.rb
index 97808975..1b2332b5 100644
--- a/lib/linguist/heuristics.rb
+++ b/lib/linguist/heuristics.rb
@@ -390,6 +390,14 @@ module Linguist
         Language["SQL"]
       end
     end
+    
+    disambiguate ".toc" do |data|
+      if /^## |@no-lib-strip@/.match(data)
+        Language["World of Warcraft Addon Data"]
+      elsif /^\\(contentsline|defcounter|beamer|boolfalse)/.match(data)
+        Language["TeX"]
+      end
+    end
 
     disambiguate ".ts" do |data|
       if data.include?("<TS ")
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 5d1848d2..9f813eed 100755
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -3830,6 +3830,14 @@ WebIDL:
   tm_scope: source.webidl
   ace_mode: text
 
+World of Warcraft Addon Data:
+  type: data
+  color: "#e0b330"
+  extensions:
+  - .toc
+  tm_scope: source.toc
+  ace_mode: text
+
 X10:
   type: programming
   aliases:
diff --git a/samples/TeX/beispiel.toc b/samples/TeX/beispiel.toc
new file mode 100644
index 00000000..7ad6bda2
--- /dev/null
+++ b/samples/TeX/beispiel.toc
@@ -0,0 +1,9 @@
+\beamer@endinputifotherversion {3.07pt}
+\select@language {german}
+\beamer@sectionintoc {1}{Geschichte}{3}{0}{1}
+\beamer@sectionintoc {2}{Merkmale}{4}{0}{2}
+\beamer@sectionintoc {3}{Kritikpunkte}{5}{0}{3}
+\beamer@sectionintoc {4}{Perl-Kultur und Spa{\ss}}{6}{0}{4}
+\beamer@sectionintoc {5}{Siehe auch}{7}{0}{5}
+\beamer@sectionintoc {6}{Einzelnachweise}{8}{0}{6}
+\beamer@sectionintoc {7}{Bedingte Ausf\"{u}hrung}{12}{0}{7}
diff --git a/samples/TeX/perl.toc b/samples/TeX/perl.toc
new file mode 100644
index 00000000..fe288644
--- /dev/null
+++ b/samples/TeX/perl.toc
@@ -0,0 +1,19 @@
+\contentsline {section}{\numberline {1}History}{3}
+\contentsline {subsection}{\numberline {1.1}Early versions}{3}
+\contentsline {subsection}{\numberline {1.2}Early Perl 5}{3}
+\contentsline {subsection}{\numberline {1.3}2000-present}{3}
+\contentsline {subsection}{\numberline {1.4}Name}{3}
+\contentsline {subsection}{\numberline {1.5}Camel symbol}{3}
+\contentsline {subsection}{\numberline {1.6}Onion symbol}{3}
+\contentsline {section}{\numberline {2}Overview}{3}
+\contentsline {subsection}{\numberline {2.1}Features}{3}
+\contentsline {subsection}{\numberline {2.2}Design}{3}
+\contentsline {subsection}{\numberline {2.3}Applications}{3}
+\contentsline {subsection}{\numberline {2.4}Implementation}{3}
+\contentsline {section}{\numberline {3}Database interfaces}{3}
+\contentsline {section}{\numberline {4}Distribution}{4}
+\contentsline {subsection}{\numberline {4.1}Availability}{4}
+\contentsline {subsubsection}{\numberline {4.3.1}Windows}{5}
+\contentsline {subsubsection}{\numberline {4.3.2}Mac OS X}{6}
+\contentsline {subsubsection}{\numberline {4.3.3}OpenBSD}{6}
+\contentsline {subsubsection}{\numberline {4.3.4}FreeBSD}{6}
diff --git a/samples/World of Warcraft Addon Data/addon.toc b/samples/World of Warcraft Addon Data/addon.toc
new file mode 100644
index 00000000..1be8b2bd
--- /dev/null
+++ b/samples/World of Warcraft Addon Data/addon.toc	
@@ -0,0 +1,6 @@
+## Interface: 60200
+## Title: Vahevian Lotus Vane
+## Notes: "Critical Threat Range"
+## Version: 4.2
+Vahevia.xml
+Lotus_Vane.lua
diff --git a/samples/World of Warcraft Addon Data/lingua.toc b/samples/World of Warcraft Addon Data/lingua.toc
new file mode 100644
index 00000000..14702fb5
--- /dev/null
+++ b/samples/World of Warcraft Addon Data/lingua.toc	
@@ -0,0 +1,11 @@
+# Internationalisation example
+
+## Title: Test
+## Title-esES: Pruebas
+## Title-huHU: Próba
+## Notes: "Testing this shit"
+## Notes-esES: "Probando la mierda esta"
+## Notes-huHU: "Kipróbálom ezt a szart"
+
+Tests.xml
+Elk.lua
diff --git a/samples/World of Warcraft Addon Data/linguist.toc b/samples/World of Warcraft Addon Data/linguist.toc
new file mode 100644
index 00000000..fc106ebc
--- /dev/null
+++ b/samples/World of Warcraft Addon Data/linguist.toc	
@@ -0,0 +1,24 @@
+# Addon manifest file
+
+## Interface: 60200
+## Title: Linguist
+## Notes: "Language savant"
+## RequiredDeps: charlockHolmes, escapeUtils, mimeTypes, rugged
+## LoadOnDemand: 1
+## Version: 4.9
+
+# This is a comment
+## SavedVariables: foo, bar
+## SavedVariablesPerCharacter: fewburt
+
+Languages.xml
+Heuristics.xml
+h-counter.lua
+ruby-isnt.lua
+
+#
+# It is possible for addons to query values of any tags with a "X-" prefix.
+# Some possibilities include:
+#
+## X-Date: "2016-04-28"
+## X-Website: "https://github.com/"
diff --git a/vendor/grammars/AutoHotkey b/vendor/grammars/AutoHotkey
index f66b9bb9..02fe2a8d 160000
--- a/vendor/grammars/AutoHotkey
+++ b/vendor/grammars/AutoHotkey
@@ -1 +1 @@
-Subproject commit f66b9bb92389318b6b757a18103c9e7e7dd8c244
+Subproject commit 02fe2a8d3de7d9b5875d9be0430b8da64595dd5d
diff --git a/vendor/grammars/SublimePapyrus b/vendor/grammars/SublimePapyrus
index 2d0b0b4c..5e90c66b 160000
--- a/vendor/grammars/SublimePapyrus
+++ b/vendor/grammars/SublimePapyrus
@@ -1 +1 @@
-Subproject commit 2d0b0b4cbf48cc8e818913f3371dfb6ef628e97f
+Subproject commit 5e90c66b305e757e75e361068196606b979eafcb
diff --git a/vendor/grammars/language-babel b/vendor/grammars/language-babel
index 58636d52..cde20a21 160000
--- a/vendor/grammars/language-babel
+++ b/vendor/grammars/language-babel
@@ -1 +1 @@
-Subproject commit 58636d52f097008ced2a0e39614d937e711337fc
+Subproject commit cde20a210f8313ede573148cd2da627ed02836a0
diff --git a/vendor/grammars/language-javascript b/vendor/grammars/language-javascript
index 55af0178..5fb7053b 160000
--- a/vendor/grammars/language-javascript
+++ b/vendor/grammars/language-javascript
@@ -1 +1 @@
-Subproject commit 55af01787477974b885aca5145de00eb53fffd62
+Subproject commit 5fb7053b459ba595459f93fea10f5341cd3cc206
diff --git a/vendor/grammars/language-toc-wow b/vendor/grammars/language-toc-wow
new file mode 160000
index 00000000..6eb5eec4
--- /dev/null
+++ b/vendor/grammars/language-toc-wow
@@ -0,0 +1 @@
+Subproject commit 6eb5eec4c065ba28e6b065a78705b788d14b1751
diff --git a/vendor/grammars/vue-syntax-highlight b/vendor/grammars/vue-syntax-highlight
index 16b6051f..b4c91d1b 160000
--- a/vendor/grammars/vue-syntax-highlight
+++ b/vendor/grammars/vue-syntax-highlight
@@ -1 +1 @@
-Subproject commit 16b6051f20b4ea994787147bf68e9064e7be9e1b
+Subproject commit b4c91d1b323c6507ea214896f7cb2d9c83108bac
diff --git a/vendor/licenses/grammar/language-toc-wow.txt b/vendor/licenses/grammar/language-toc-wow.txt
new file mode 100644
index 00000000..970dc139
--- /dev/null
+++ b/vendor/licenses/grammar/language-toc-wow.txt
@@ -0,0 +1,25 @@
+---
+type: grammar
+name: language-toc-wow
+license: mit
+---
+Copyright (c) 2016 Kyle Buller
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.