test for staging branch
Merge branch 'master' into staging

Conflicts:
	wp-config-sample.php