Plone 4.3 compatibility of search view
Merge remote-tracking branch 'collective/master'

Conflicts:
	CHANGES.txt