community
Merge remote-tracking branch 'origin/master'

Conflicts:
	grayscale/index.html