Idris is upstream in Pygments now: https://bitbucket.org/birkenfeld/pygments-main/pull-request/210
Merge branch 'master' into 1100-local

Conflicts:
	lib/linguist/languages.yml
Merge pull request #1306 from github/1100-local

1100 local