Merge remote-tracking branch 'origin/gh-pages'

Conflicts:
	docs/index.html