Merge origin/master

Conflicts:
	.gitignore
	wp-content/languages/en_US.mo
	wp-content/languages/zh_CN.mo
	wp-settings.php
Merge origin/master