Added 'options' parameter to kotti search.
Merge tag '0.9.3' into 0.9.x

Conflicts:
	CHANGES.txt
	setup.py