Update to WordPress 4.1
Merge remote-tracking branch 'upstream/master' into wpranger

Conflicts:
	CHANGELOG.md