Merge remote-tracking branch 'underscores/master' into _s

Conflicts:
	comments.php