Merge branch 'master' into perl_6

Conflicts:
	lib/linguist/samples.json

lib/linguist/languages.yml

@@ -726,6 +726,12 @@ Haxe:
   extensions:
   - .hxsl
 
+IDL:
+  type: programming
+  lexer: Text only
+  color: "#e3592c"
+  primary_extension: .pro
+
 INI:
   type: data
   extensions:
@@ -1269,8 +1275,6 @@ Prolog:
   type: programming
   color: "#74283c"
   primary_extension: .prolog
-  extensions:
-  - .pro
 
 Protocol Buffer:
   type: markup