Fix diazo.scheme variable definition
Merge branch 'master' of git://github.com/plone/diazo into query-string-variable

Conflicts:
	docs/CHANGES.txt