added grace support
fixed whitespace
Merge branch 'master' into 1323-local

Conflicts:
	lib/linguist/samples.json
Merge pull request #1337 from github/1323-local

1323 local