Merge remote-tracking branch 'origin/a' into b

Conflicts:
	index.html