Merge remote-tracking branch 'remotes/origin/master' into gh-pages

Conflicts:
	index.html