Merge branch 'master' into describe-inputs

Conflicts:
	pywps/app.py