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

Conflicts:
	composer.json
	composer.lock