Merge branch 'master' into 1623-local

Conflicts:
	lib/linguist/heuristics.rb