Merge remote-tracking branch 'Yoast/master' into Fix-settings-issues

Conflicts:
	wp-seo.php
Merge remote-tracking branch 'Yoast/release/1.5' into Fix-settings-issues

Conflicts:
	wp-seo.php