Merge branch 'refs/heads/master' into gh-pages

Conflicts:
	index.html