Merge branch 'master' into 891-update

Conflicts:
	lib/linguist/samples.json

lib/linguist/language.rb

@@ -485,7 +485,7 @@ module Linguist
     #
     # Returns html String
     def colorize(text, options = {})
-      lexer.highlight(text, options = {})
+      lexer.highlight(text, options)
     end
 
     # Public: Return name as String representation

lib/linguist/languages.yml

@@ -626,6 +626,11 @@ Forth:
   extensions:
   - .4th
 
+Game Maker Language:
+  type: programming
+  lexer: JavaScript
+  primary_extension: .gml
+
 GAS:
   type: programming
   group: Assembly