#844 Redesign search results when as posts
Merge remote-tracking branch 'origin/version3.5' into version3.5

Conflicts:
	include/version.php