This pull request solves issue #674, see it for details.
update
Merge branch 'master' into 675-local

Conflicts:
	.gitignore
	lib/linguist/languages.yml
	lib/linguist/samples.json
Merge pull request #1294 from github/675-local

675 local