Merge branch 'hotfix/4.0.0.7'
Merge tag '4.0.1'
Merge tag '4.1'

Conflicts:
	readme.html
	wp-admin/about.php
	wp-admin/includes/plugin-install.php
	wp-admin/js/editor-expand.js
	wp-admin/js/editor-expand.min.js
	wp-includes/css/media-views-rtl.min.css
	wp-includes/css/media-views.min.css
	wp-includes/formatting.php
	wp-includes/js/media-grid.min.js
	wp-includes/js/media-views.min.js
	wp-includes/js/mediaelement/flashmediaelement.swf
	wp-includes/js/mediaelement/mediaelement-and-player.min.js
	wp-includes/js/quicktags.min.js
	wp-includes/js/tinymce/plugins/wpeditimage/plugin.js
	wp-includes/js/tinymce/plugins/wpeditimage/plugin.min.js
	wp-includes/js/tinymce/plugins/wpview/plugin.min.js
	wp-includes/js/tinymce/wp-tinymce.js.gz
	wp-includes/version.php
Adding referer spammers to deny directive.
Merge branch 'hotfix/4.1.0.1' into development