Merge branch 'master' into 1530-local

Conflicts:
	lib/linguist/samples.json

lib/linguist/languages.yml

@@ -793,6 +793,12 @@ GAS:
   - .s
   - .S
 
+GDScript:
+  type: programming
+  lexer: Text only
+  extensions:
+  - .gd
+
 GLSL:
   group: C
   type: programming
@@ -1800,6 +1806,7 @@ Processing:
 
 Prolog:
   type: programming
+  lexer: Logtalk
   color: "#74283c"
   extensions:
   - .pl