Merge https://github.com/WordPress/WordPress

Conflicts:
	index.php