Merge branch 'master' into updated-922

Conflicts:
	lib/linguist/samples.json

lib/linguist/languages.yml

@@ -1082,6 +1082,11 @@ Mask:
   ace_mode: scss
   primary_extension: .mask
 
+Mathematica:
+  type: programming
+  primary_extension: .mathematica
+  lexer: Text only
+
 Matlab:
   type: programming
   color: "#bb92ac"

lib/linguist/samples.json

@@ -247,6 +247,9 @@
     "Mask": [
       ".mask"
     ],
+    "Mathematica": [
+      ".m"
+    ],
     "Matlab": [
       ".m"
     ],
@@ -572,8 +575,8 @@
       ".gemrc"
     ]
   },
-  "tokens_total": 456279,
-  "languages_total": 566,
+  "tokens_total": 456690,
+  "languages_total": 569,
   "tokens": {
     "ABAP": {
       "*/**": 1,
@@ -30741,6 +30744,84 @@
       "footer": 1,
       "bazCompo": 1
     },
+    "Mathematica": {
+      "Get": 1,
+      "[": 74,
+      "]": 73,
+      "Paclet": 1,
+      "Name": 1,
+      "-": 8,
+      "Version": 1,
+      "MathematicaVersion": 1,
+      "Description": 1,
+      "Creator": 1,
+      "Extensions": 1,
+      "{": 2,
+      "Language": 1,
+      "MainPage": 1,
+      "}": 2,
+      "BeginPackage": 1,
+      ";": 41,
+      "PossiblyTrueQ": 3,
+      "usage": 22,
+      "PossiblyFalseQ": 2,
+      "PossiblyNonzeroQ": 3,
+      "Begin": 2,
+      "expr_": 4,
+      "Not": 6,
+      "TrueQ": 4,
+      "expr": 4,
+      "End": 2,
+      "AnyQ": 3,
+      "AnyElementQ": 4,
+      "AllQ": 2,
+      "AllElementQ": 2,
+      "AnyNonzeroQ": 2,
+      "AnyPossiblyNonzeroQ": 2,
+      "RealQ": 3,
+      "PositiveQ": 3,
+      "NonnegativeQ": 3,
+      "PositiveIntegerQ": 3,
+      "NonnegativeIntegerQ": 4,
+      "IntegerListQ": 5,
+      "PositiveIntegerListQ": 3,
+      "NonnegativeIntegerListQ": 3,
+      "IntegerOrListQ": 2,
+      "PositiveIntegerOrListQ": 2,
+      "NonnegativeIntegerOrListQ": 2,
+      "SymbolQ": 2,
+      "SymbolOrNumberQ": 2,
+      "cond_": 4,
+      "L_": 5,
+      "Fold": 3,
+      "Or": 1,
+      "False": 4,
+      "cond": 4,
+      "/@": 3,
+      "L": 4,
+      "Flatten": 1,
+      "And": 4,
+      "True": 2,
+      "SHEBANG#!#!=": 1,
+      "n_": 5,
+      "Im": 1,
+      "n": 8,
+      "Positive": 2,
+      "IntegerQ": 3,
+      "&&": 4,
+      "input_": 6,
+      "ListQ": 1,
+      "input": 11,
+      "MemberQ": 3,
+      "IntegerQ/@input": 1,
+      "||": 4,
+      "a_": 2,
+      "Head": 2,
+      "a": 3,
+      "Symbol": 2,
+      "NumericQ": 1,
+      "EndPackage": 1
+    },
     "Matlab": {
       "function": 34,
       "[": 311,
@@ -49563,6 +49644,7 @@
     "Makefile": 50,
     "Markdown": 1,
     "Mask": 74,
+    "Mathematica": 411,
     "Matlab": 11942,
     "Max": 714,
     "MediaWiki": 766,
@@ -49713,6 +49795,7 @@
     "Makefile": 2,
     "Markdown": 1,
     "Mask": 1,
+    "Mathematica": 3,
     "Matlab": 39,
     "Max": 3,
     "MediaWiki": 1,
@@ -49790,5 +49873,5 @@
     "Xtend": 2,
     "YAML": 2
   },
-  "md5": "df13bc8f133300e197989b7934998e7c"
+  "md5": "369eb61211321cd0a217de22110731ac"
 }