Update WordPress

Update WordPress now!
Merge branch 'master' into update-wordpress-411
Merge branch 'update-wordpress-411'

Conflicts:
	test-folder/sample2.txt