Fix quoting of + in url_quote_plus
Merge branch '0.9-maintenance'

Conflicts:
	CHANGES